From 751162558553eb09171b7ed56fffd07782c956cd Mon Sep 17 00:00:00 2001 From: liach <7806504+liach@users.noreply.github.com> Date: Tue, 14 Sep 2021 15:22:24 -0500 Subject: [PATCH] map regenerating chunk (#2653) * map regenerating chunk Signed-off-by: liach * a few more improvements Co-authored-by: liach --- mappings/net/minecraft/world/chunk/Chunk.mapping | 2 ++ .../minecraft/world/chunk/ChunkStatus.mapping | 16 ++++++++++++---- .../world/chunk/RegeneratingChunk.mapping | 10 ++++++++++ 3 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 mappings/net/minecraft/world/chunk/RegeneratingChunk.mapping diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index 9a016b26bf..a6e4c4cdb0 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -65,3 +65,5 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk ARG 1 ySectionCoord METHOD method_33729 getSection (I)Lnet/minecraft/class_2826; ARG 1 yIndex + METHOD method_35319 sampleMaxHeightMap (Lnet/minecraft/class_2902$class_2903;)Lnet/minecraft/class_2338; + ARG 1 type diff --git a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping index fe981df5e0..959cd0b063 100644 --- a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping @@ -23,11 +23,17 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 7 loadTask METHOD method_12151 (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;Z)Ljava/util/concurrent/CompletableFuture; ARG 0 status + ARG 5 lightingProvider + ARG 8 chunk METHOD method_12152 getTaskMargin ()I METHOD method_12154 runGenerationTask (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;Z)Ljava/util/concurrent/CompletableFuture; + ARG 1 executor ARG 2 world + ARG 3 generator ARG 4 structureManager ARG 5 lightingProvider + ARG 6 fullChunkConverter + ARG 7 chunks METHOD method_12155 getMaxDistanceFromFull ()I METHOD method_12160 getHeightmapTypes ()Ljava/util/EnumSet; METHOD method_12161 byDistanceFromFull (I)Lnet/minecraft/class_2806; @@ -110,11 +116,13 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus 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;Z)Ljava/util/concurrent/CompletableFuture; ARG 1 targetStatus COMMENT the status the chunk will be set to after the task is completed + ARG 2 executor ARG 3 world + ARG 4 generator ARG 5 structureManager ARG 6 lightingProvider - ARG 7 convertCallback - COMMENT will be invoked by statuses which have some special convert logic (e.g. the FULL status to convert the chunk to a full chunk) + ARG 7 fullChunkConverter + COMMENT a function that can convert a raw chunk to a full chunk CLASS class_2808 ChunkType COMMENT Specifies the type of a chunk FIELD field_12807 LEVELCHUNK Lnet/minecraft/class_2806$class_2808; @@ -132,6 +140,6 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 2 world ARG 3 structureManager ARG 4 lightingProvider - ARG 5 convertCallback - COMMENT will be invoked by statuses which have some special convert logic (e.g. the FULL status to convert the chunk to a full chunk) + ARG 5 fullChunkConverter + COMMENT a function that can convert a raw chunk to a full chunk ARG 6 chunk diff --git a/mappings/net/minecraft/world/chunk/RegeneratingChunk.mapping b/mappings/net/minecraft/world/chunk/RegeneratingChunk.mapping new file mode 100644 index 0000000000..dddb15b61e --- /dev/null +++ b/mappings/net/minecraft/world/chunk/RegeneratingChunk.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_6469 net/minecraft/world/chunk/RegeneratingChunk + COMMENT A regenerating world chunk represented as a proto chunk. Necessary since + COMMENT in {@link ChunkStatus}, the generation tasks assume the provided chunks + COMMENT are proto chunks and perform unchecked casts. Used by {@link + COMMENT net.minecraft.server.command.ResetChunksCommand /resetchunks} command. + FIELD field_34234 delegate Lnet/minecraft/class_2818; + METHOD (Lnet/minecraft/class_2818;)V + ARG 1 delegate + METHOD method_37758 convertHeightmapType (Lnet/minecraft/class_2902$class_2903;)Lnet/minecraft/class_2902$class_2903; + ARG 1 desiredType