mirrors/yarn
mirrors
/
yarn
mirror of https://github.com/FabricMC/yarn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Map Chunk loading, Chunks and Chunk Generation (#1151) 

* ThreadedAnvilChunkStorage#method_20458(2) -> tryUnloadChunk

* ThreadedAnvilChunkStorage#tryUnloadChunk(2)[1 = ] -> chunkPosLong

* ThreadedAnvilChunkStorage#method_21676(1) -> getFutureStatus

* ChunkHolder#method_20725(0) -> getBorderFuture

* ChunkTicketManager#method_21623(1)[1 = ] -> chunkPosLong

* ChunkTicketManager#method_21623(1) -> getTicket

* +191 doc in ThreadedAnvilChunkStorage%MAX_LEVEL

* ChunkHolder%field_19238 -> ticking

* ChunkHolder#method_20385(0) -> updateTickingStatus

* ChunkHolder#method_20384(0) -> isTicking

* ProtoChunk#method_22405(1) -> setBiomeArray

* ProtoChunk%field_20656 -> biomes

* ChunkHolder#method_23271(0) -> getLevelType

* ProtoChunk#<init>(5)[5 = ] -> fluidTickScheduler

* ProtoChunk#<init>(5)[4 = ] -> blockTickScheduler

* Chunk#setBlockState(3)[3 = ] -> moved

* ChunkTicketManager#addTicket(2)[3 = ] -> ticket

* net/minecraft/world/chunk/ChunkStatus$Task -> GenerationTask

* +54 doc in net/minecraft/world/chunk/ChunkStatus$GenerationTask

* net/minecraft/world/chunk/ChunkStatus$GenerationTask -> Task

* -54 doc in net/minecraft/world/chunk/ChunkStatus$Task

* WorldChunk#<init>(9)[5 = ] -> blockTickScheduler

* WorldChunk#<init>(9)[6 = ] -> fluidTickScheduler

* WorldChunk#<init>(9)[7 = ] -> inhabitedTime

* WorldChunk#<init>(9)[10 = ] -> loadToWorldConsumer

* WorldChunk#getFluidState(3)[3 = ] -> z

* WorldChunk#setLoadedToWorld(1)[1 = ] -> loaded

* ThreadedAnvilChunkStorage$TicketManager#<init>(2)[1 = ] -> workerExecutor

* ThreadedAnvilChunkStorage$TicketManager#<init>(2)[2 = ] -> mainThreadExecutor

* ThreadedAnvilChunkStorage#method_20605(1) -> unloadChunks

* ThreadedAnvilChunkStorage#unloadChunks(1)[1 = ] -> shouldKeepTicking

* ThreadedAnvilChunkStorage#method_20619(1) -> loadChunk

* ThreadedAnvilChunkStorage#loadChunk(1)[1 = ] -> pos

* ThreadedAnvilChunkStorage#method_20617(2) -> generateChunk

* Fix issues
This commit is contained in:
modmuss50 2020-03-05 21:39:17 +00:00 committed by GitHub
parent 6bf062b174
commit 991ed5c736
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mappings/net/minecraft/server/world/ChunkHolder.mapping
View File

@ -22,6 +22,7 @@ CLASS net/minecraft/class_3193 net/minecraft/server/world/ChunkHolder
FIELD field_17208 completedLevel I
FIELD field_17209 levelUpdateListener Lnet/minecraft/class_3193$class_3896;
FIELD field_17210 playersWatchingChunkProvider Lnet/minecraft/class_3193$class_3897;
FIELD field_19238 ticking Z
FIELD field_19333 tickingFuture Ljava/util/concurrent/CompletableFuture;
METHOD <init> (Lnet/minecraft/class_1923;ILnet/minecraft/class_3568;Lnet/minecraft/class_3193$class_3896;Lnet/minecraft/class_3193$class_3897;)V
ARG 1 pos
@ -65,6 +66,10 @@ CLASS net/minecraft/class_3193 net/minecraft/server/world/ChunkHolder
METHOD method_17207 setCompletedLevel (I)V
ARG 1 level
METHOD method_17208 getCompletedLevel ()I
METHOD method_20384 isTicking ()Z
METHOD method_20385 updateTickingStatus ()V
METHOD method_20725 getBorderFuture ()Ljava/util/concurrent/CompletableFuture;
METHOD method_23271 getLevelType ()Lnet/minecraft/class_3193$class_3194;
CLASS class_3194 LevelType
METHOD method_14014 isAfter (Lnet/minecraft/class_3193$class_3194;)Z
ARG 1 levelType

3
mappings/net/minecraft/server/world/ChunkTicketManager.mapping
View File

@ -25,6 +25,7 @@ CLASS net/minecraft/class_3204 net/minecraft/server/world/ChunkTicketManager
ARG 1 pos
METHOD method_14042 addTicket (JLnet/minecraft/class_3228;)V
ARG 1 position
ARG 3 ticket
METHOD method_14045 purge ()V
METHOD method_14046 getLevel (Lnet/minecraft/class_4706;)I
METHOD method_14048 handleChunkEnter (Lnet/minecraft/class_4076;Lnet/minecraft/class_3222;)V
@ -66,6 +67,8 @@ CLASS net/minecraft/class_3204 net/minecraft/server/world/ChunkTicketManager
ARG 2 pos
ARG 3 level
ARG 4 argument
METHOD method_21623 getTicket (J)Ljava/lang/String;
ARG 1 pos
CLASS class_3205 DistanceFromNearestPlayerTracker
FIELD field_13896 distanceFromNearestPlayer Lit/unimi/dsi/fastutil/longs/Long2ByteMap;
FIELD field_17461 maxDistance I

12
mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping
View File

@ -18,6 +18,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor
FIELD field_17706 structureManager Lnet/minecraft/class_3485;
FIELD field_17707 saveDir Ljava/io/File;
FIELD field_18239 MAX_LEVEL I
COMMENT Specifies the maximum ticket level a chunk can be before a chunk's {@link net.minecraft.server.world.ChunkHolder.LevelType} is {@link net.minecraft.server.world.ChunkHolder.LevelType#BORDER}.
FIELD field_18241 playerChunkWatchingManager Lnet/minecraft/class_3210;
FIELD field_18242 entityTrackers Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
FIELD field_18243 watchDistance I
@ -109,8 +110,16 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor
METHOD method_19488 getPointOfInterestStorage ()Lnet/minecraft/class_4153;
METHOD method_20441 releaseLightTicket (Lnet/minecraft/class_1923;)V
ARG 1 pos
METHOD method_20458 tryUnloadChunk (JLnet/minecraft/class_3193;)V
ARG 1 pos
METHOD method_20580 createBorderFuture (Lnet/minecraft/class_3193;)Ljava/util/concurrent/CompletableFuture;
METHOD method_20605 unloadChunks (Ljava/util/function/BooleanSupplier;)V
ARG 1 shouldKeepTicking
METHOD method_20617 generateChunk (Lnet/minecraft/class_3193;Lnet/minecraft/class_2806;)Ljava/util/concurrent/CompletableFuture;
METHOD method_20619 loadChunk (Lnet/minecraft/class_1923;)Ljava/util/concurrent/CompletableFuture;
ARG 1 pos
METHOD method_21619 exportChunks (Ljava/io/Writer;)V
METHOD method_21676 getFutureStatus (Ljava/util/concurrent/CompletableFuture;)Ljava/lang/String;
CLASS class_3208 EntityTracker
FIELD field_18246 entry Lnet/minecraft/class_3231;
FIELD field_18247 entity Lnet/minecraft/class_1297;
@ -137,3 +146,6 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor
METHOD <init> (Lnet/minecraft/class_3898;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)V
ARG 1 workerExecutor
ARG 2 mainThreadExecutor
METHOD <init> (Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)V
ARG 1 workerExecutor
ARG 2 mainThreadExecutor

1
mappings/net/minecraft/world/chunk/Chunk.mapping
View File

@ -17,6 +17,7 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk
METHOD method_12010 setBlockState (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Z)Lnet/minecraft/class_2680;
ARG 1 pos
ARG 2 state
ARG 3 moved
METHOD method_12011 getHeightmaps ()Ljava/util/Collection;
METHOD method_12012 getPostProcessingLists ()[Lit/unimi/dsi/fastutil/shorts/ShortList;
METHOD method_12013 getBlockTickScheduler ()Lnet/minecraft/class_1951;

5
mappings/net/minecraft/world/chunk/ProtoChunk.mapping
View File

@ -19,6 +19,10 @@ CLASS net/minecraft/class_2839 net/minecraft/world/chunk/ProtoChunk
FIELD field_12929 entities Ljava/util/List;
FIELD field_12930 structureReferences Ljava/util/Map;
FIELD field_17105 lightingProvider Lnet/minecraft/class_3568;
FIELD field_20656 biomes Lnet/minecraft/class_4548;
METHOD <init> (Lnet/minecraft/class_1923;Lnet/minecraft/class_2843;[Lnet/minecraft/class_2826;Lnet/minecraft/class_2850;Lnet/minecraft/class_2850;)V
ARG 4 blockTickScheduler
ARG 5 fluidTickScheduler
METHOD method_12023 getLightingProvider ()Lnet/minecraft/class_3568;
METHOD method_12295 getEntities ()Ljava/util/List;
METHOD method_12296 getLightSourcesBySection ()[Lit/unimi/dsi/fastutil/shorts/ShortList;
@ -44,3 +48,4 @@ CLASS net/minecraft/class_2839 net/minecraft/world/chunk/ProtoChunk
METHOD method_16679 getSection (I)Lnet/minecraft/class_2826;
ARG 1 y
METHOD method_17032 setLightingProvider (Lnet/minecraft/class_3568;)V
METHOD method_22405 setBiomes (Lnet/minecraft/class_4548;)V

7
mappings/net/minecraft/world/chunk/WorldChunk.mapping
View File

@ -25,6 +25,11 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk
FIELD field_20655 biomeArray Lnet/minecraft/class_4548;
METHOD <init> (Lnet/minecraft/class_1937;Lnet/minecraft/class_2839;)V
ARG 1 world
METHOD <init> (Lnet/minecraft/class_1937;Lnet/minecraft/class_1923;Lnet/minecraft/class_4548;Lnet/minecraft/class_2843;Lnet/minecraft/class_1951;Lnet/minecraft/class_1951;J[Lnet/minecraft/class_2826;Ljava/util/function/Consumer;)V
ARG 5 blockTickScheduler
ARG 6 fluidTickScheduler
ARG 7 inhabitedTime
ARG 10 loadToWorldConsumer
METHOD method_12023 getLightingProvider ()Lnet/minecraft/class_3568;
METHOD method_12200 getWorld ()Lnet/minecraft/class_1937;
METHOD method_12201 getBlockEntity (Lnet/minecraft/class_2338;Lnet/minecraft/class_2818$class_2819;)Lnet/minecraft/class_2586;
@ -56,11 +61,13 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk
METHOD method_12224 loadFromPacket (Lnet/minecraft/class_4548;Lnet/minecraft/class_2540;Lnet/minecraft/class_2487;I)V
METHOD method_12225 getLevelType ()Lnet/minecraft/class_3193$class_3194;
METHOD method_12226 setLoadedToWorld (Z)V
ARG 1 loaded
METHOD method_12232 setUnsaved (Z)V
ARG 1 unsaved
METHOD method_12234 getFluidState (III)Lnet/minecraft/class_3610;
ARG 1 x
ARG 2 y
ARG 3 z
METHOD method_18029 getEntities (Lnet/minecraft/class_1299;Lnet/minecraft/class_238;Ljava/util/List;Ljava/util/function/Predicate;)V
ARG 1 type
ARG 2 box