From 8a6a1db2ce6bc1a814673cf5af37be899ec7e104 Mon Sep 17 00:00:00 2001 From: i509VCB Date: Fri, 26 Jun 2020 04:34:45 -0700 Subject: [PATCH] Map chunk and chunk statuses (Reattached) (#1511) * Map chunk and chunk statuses * Update mappings/net/minecraft/world/chunk/ProtoChunk.mapping Co-authored-by: liach <7806504+liach@users.noreply.github.com> * So we don't have #1493 here * chunks is fine * Update mappings/net/minecraft/block/Block.mapping Co-authored-by: liach <7806504+liach@users.noreply.github.com> * Update ChunkStatus.mapping Co-authored-by: liach <7806504+liach@users.noreply.github.com> --- mappings/net/minecraft/block/Block.mapping | 7 + .../client/world/ClientChunkManager.mapping | 2 + .../minecraft/world/ChunkSerializer.mapping | 10 ++ .../net/minecraft/world/EntityView.mapping | 3 + .../minecraft/world/StructureHolder.mapping | 4 + .../net/minecraft/world/chunk/Chunk.mapping | 8 +- .../minecraft/world/chunk/ChunkStatus.mapping | 144 +++++++++++++++++- .../minecraft/world/chunk/EmptyChunk.mapping | 1 + .../world/chunk/PalettedContainer.mapping | 6 + .../minecraft/world/chunk/ProtoChunk.mapping | 23 +++ .../world/chunk/ReadOnlyChunk.mapping | 5 + .../minecraft/world/chunk/WorldChunk.mapping | 20 ++- .../world/gen/StructureAccessor.mapping | 20 +++ 13 files changed, 242 insertions(+), 11 deletions(-) diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index 7729e35201..130385dd58 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -25,6 +25,12 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block METHOD method_23350 getJumpVelocityMultiplier ()F METHOD method_27839 is (Lnet/minecraft/class_2248;)Z ARG 1 block + METHOD method_30094 replaced (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;I)V + ARG 0 state + ARG 1 newState + ARG 2 world + ARG 3 pos + ARG 4 flags METHOD method_9496 randomDisplayTick (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Ljava/util/Random;)V ARG 1 state ARG 2 world @@ -187,6 +193,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 2 world ARG 3 pos ARG 4 flags + ARG 5 maxUpdateDepth METHOD method_9614 isShapeFullCube (Lnet/minecraft/class_265;)Z ARG 0 shape CLASS 1 diff --git a/mappings/net/minecraft/client/world/ClientChunkManager.mapping b/mappings/net/minecraft/client/world/ClientChunkManager.mapping index 1fb1052fe3..11c8750070 100644 --- a/mappings/net/minecraft/client/world/ClientChunkManager.mapping +++ b/mappings/net/minecraft/client/world/ClientChunkManager.mapping @@ -13,6 +13,8 @@ CLASS net/minecraft/class_631 net/minecraft/client/world/ClientChunkManager ARG 3 biomes ARG 4 buf ARG 5 tag + ARG 6 verticalStripBitmask + ARG 7 complete METHOD method_20180 updateLoadDistance (I)V ARG 1 loadDistance METHOD method_20181 positionEquals (Lnet/minecraft/class_2818;II)Z diff --git a/mappings/net/minecraft/world/ChunkSerializer.mapping b/mappings/net/minecraft/world/ChunkSerializer.mapping index 8b453e4671..605f71fe1c 100644 --- a/mappings/net/minecraft/world/ChunkSerializer.mapping +++ b/mappings/net/minecraft/world/ChunkSerializer.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_2852 net/minecraft/world/ChunkSerializer FIELD field_13001 LOGGER Lorg/apache/logging/log4j/Logger; + METHOD method_12376 (ILnet/minecraft/class_2826;)Z + ARG 1 chunkSection METHOD method_12377 getChunkType (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2806$class_2808; ARG 0 tag METHOD method_12385 writeStructures (Lnet/minecraft/class_1923;Ljava/util/Map;Ljava/util/Map;)Lnet/minecraft/class_2487; @@ -12,6 +14,10 @@ CLASS net/minecraft/class_2852 net/minecraft/world/ChunkSerializer METHOD method_12387 readStructureReferences (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)Ljava/util/Map; ARG 0 pos ARG 1 tag + METHOD method_12388 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2818;)V + ARG 1 chunk + METHOD method_12391 (Lnet/minecraft/class_3611;)Z + ARG 0 fluid METHOD method_12392 readStructureStarts (Lnet/minecraft/class_3485;Lnet/minecraft/class_2487;J)Ljava/util/Map; METHOD method_12393 toNbt ([Lit/unimi/dsi/fastutil/shorts/ShortList;)Lnet/minecraft/class_2499; ARG 0 lists @@ -21,6 +27,10 @@ CLASS net/minecraft/class_2852 net/minecraft/world/ChunkSerializer ARG 2 poiStorage ARG 3 pos ARG 4 tag + METHOD method_12396 (Lnet/minecraft/class_2248;)Z + ARG 0 block METHOD method_12410 serialize (Lnet/minecraft/class_3218;Lnet/minecraft/class_2791;)Lnet/minecraft/class_2487; ARG 0 world ARG 1 chunk + METHOD method_18091 (Lnet/minecraft/class_2818;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1297; + ARG 1 entity diff --git a/mappings/net/minecraft/world/EntityView.mapping b/mappings/net/minecraft/world/EntityView.mapping index a2138ee3cb..24377bd6da 100644 --- a/mappings/net/minecraft/world/EntityView.mapping +++ b/mappings/net/minecraft/world/EntityView.mapping @@ -50,6 +50,9 @@ CLASS net/minecraft/class_1924 net/minecraft/world/EntityView METHOD method_18470 getPlayerByUuid (Ljava/util/UUID;)Lnet/minecraft/class_1657; ARG 1 uuid METHOD method_20743 getEntityCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/function/Predicate;)Ljava/util/stream/Stream; + ARG 1 entity + ARG 2 box + ARG 3 predicate METHOD method_21726 getClosestEntity (Ljava/lang/Class;Lnet/minecraft/class_4051;Lnet/minecraft/class_1309;DDDLnet/minecraft/class_238;)Lnet/minecraft/class_1309; ARG 1 entityClass ARG 2 targetPredicate diff --git a/mappings/net/minecraft/world/StructureHolder.mapping b/mappings/net/minecraft/world/StructureHolder.mapping index 7cb9b01a0e..134057352b 100644 --- a/mappings/net/minecraft/world/StructureHolder.mapping +++ b/mappings/net/minecraft/world/StructureHolder.mapping @@ -1,10 +1,14 @@ CLASS net/minecraft/class_2810 net/minecraft/world/StructureHolder METHOD method_12179 getStructureReferences ()Ljava/util/Map; METHOD method_12180 getStructureReferences (Lnet/minecraft/class_3195;)Lit/unimi/dsi/fastutil/longs/LongSet; + ARG 1 structure METHOD method_12181 getStructureStart (Lnet/minecraft/class_3195;)Lnet/minecraft/class_3449; + ARG 1 structure METHOD method_12182 addStructureReference (Lnet/minecraft/class_3195;J)V + ARG 1 structure ARG 2 reference METHOD method_12183 setStructureReferences (Ljava/util/Map;)V ARG 1 structureReferences METHOD method_12184 setStructureStart (Lnet/minecraft/class_3195;Lnet/minecraft/class_3449;)V + ARG 1 structure ARG 2 start diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index c568e4aa86..704ae628ff 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -28,7 +28,7 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk METHOD method_12020 setLightOn (Z)V ARG 1 lightOn METHOD method_12021 getBlockEntityPositions ()Ljava/util/Set; - METHOD method_12024 getBlockEntityTagAt (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2487; + METHOD method_12024 getBlockEntityTag (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2487; ARG 1 pos METHOD method_12026 getList ([Lit/unimi/dsi/fastutil/shorts/ShortList;I)Lit/unimi/dsi/fastutil/shorts/ShortList; ARG 0 lists @@ -41,6 +41,7 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk ARG 1 type METHOD method_12033 getInhabitedTime ()J METHOD method_12034 setStructureStarts (Ljava/util/Map;)V + ARG 1 structureStarts METHOD method_12036 getBiomeArray ()Lnet/minecraft/class_4548; METHOD method_12037 setHeightmap (Lnet/minecraft/class_2902$class_2903;[J)V ARG 1 type @@ -56,3 +57,8 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk METHOD method_12043 setLastSaveTime (J)V ARG 1 lastSaveTime METHOD method_12044 needsSaving ()Z + METHOD method_12228 areSectionsEmptyBetween (II)Z + ARG 1 lowerHeight + ARG 2 upperHeight + METHOD method_20598 getPackedBlockEntityTag (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2487; + ARG 1 pos diff --git a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping index ed713c4bf3..24cb14bc75 100644 --- a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus FIELD field_12788 STATUS_TO_TARGET_GENERATION_RADIUS Lit/unimi/dsi/fastutil/ints/IntList; FIELD field_12789 id Ljava/lang/String; FIELD field_12791 DISTANCE_TO_TARGET_GENERATION_STATUS Ljava/util/List; - FIELD field_12792 task Lnet/minecraft/class_2806$class_2807; + FIELD field_12792 generationTask Lnet/minecraft/class_2806$class_2807; FIELD field_12793 heightMapTypes Ljava/util/EnumSet; FIELD field_12802 taskMargin I FIELD field_16646 index I @@ -11,17 +11,31 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus FIELD field_19159 PRE_CARVER_HEIGHTMAPS Ljava/util/EnumSet; FIELD field_19160 POST_CARVER_HEIGHTMAPS Ljava/util/EnumSet; FIELD field_19345 STATUS_BUMP_NO_GEN_TASK Lnet/minecraft/class_2806$class_4305; - FIELD field_19346 noGenTask Lnet/minecraft/class_2806$class_4305; + COMMENT A load task which only bumps the chunk status of the chunk. + FIELD field_19346 loadTask Lnet/minecraft/class_2806$class_4305; METHOD (Ljava/lang/String;Lnet/minecraft/class_2806;ILjava/util/EnumSet;Lnet/minecraft/class_2806$class_2808;Lnet/minecraft/class_2806$class_2807;Lnet/minecraft/class_2806$class_4305;)V ARG 1 id ARG 2 previous ARG 3 taskMargin ARG 4 heightMapTypes ARG 5 chunkType - ARG 6 task + ARG 6 generationTask + ARG 7 loadTask + METHOD method_12151 (Lnet/minecraft/class_2806;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;)Ljava/util/concurrent/CompletableFuture; + ARG 0 status + ARG 1 world + ARG 2 generator + ARG 3 structureManager + ARG 4 lightingProvider + ARG 6 surroundingChunks + ARG 7 chunk METHOD method_12152 getTaskMargin ()I - METHOD method_12154 runTask (Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;)Ljava/util/concurrent/CompletableFuture; + METHOD method_12154 runGenerationTask (Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;)Ljava/util/concurrent/CompletableFuture; + ARG 1 world ARG 2 chunkGenerator + ARG 3 structureManager + ARG 4 lightingProvider + ARG 6 chunks METHOD method_12155 getMaxTargetGenerationRadius ()I METHOD method_12160 getHeightmapTypes ()Ljava/util/EnumSet; METHOD method_12161 getTargetGenerationStatus (I)Lnet/minecraft/class_2806; @@ -41,6 +55,14 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 3 heightMapTypes ARG 4 chunkType ARG 5 task + METHOD method_16556 (Lnet/minecraft/class_2806;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;)Ljava/util/concurrent/CompletableFuture; + ARG 0 targetStatus + ARG 1 world + ARG 2 generator + ARG 3 structureManager + ARG 4 lightingProvider + ARG 6 surroundingChunks + ARG 7 chunk METHOD method_16557 register (Ljava/lang/String;Lnet/minecraft/class_2806;ILjava/util/EnumSet;Lnet/minecraft/class_2806$class_2808;Lnet/minecraft/class_2806$class_2807;)Lnet/minecraft/class_2806; ARG 0 id ARG 1 previous @@ -51,9 +73,68 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus METHOD method_16558 createOrderedList ()Ljava/util/List; METHOD method_16559 getIndex ()I METHOD method_16560 getPrevious ()Lnet/minecraft/class_2806; + METHOD method_16563 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Ljava/util/List;Lnet/minecraft/class_2791;)V + ARG 0 world + ARG 1 generator + ARG 2 surroundingChunks + ARG 3 chunk + METHOD method_16564 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Ljava/util/List;Lnet/minecraft/class_2791;)V + ARG 0 world + ARG 1 generator + ARG 2 surroundingChunks + ARG 3 chunk + METHOD method_16565 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Ljava/util/List;Lnet/minecraft/class_2791;)V + ARG 0 world + ARG 1 generator + ARG 2 surroundingChunks + ARG 3 chunk + METHOD method_16566 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Ljava/util/List;Lnet/minecraft/class_2791;)V + ARG 0 targetStatus + ARG 1 generator + ARG 2 surroundingChunks + ARG 3 chunk + METHOD method_16567 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Ljava/util/List;Lnet/minecraft/class_2791;)V + ARG 0 world + ARG 1 generator + ARG 2 surroundingChunks + ARG 3 chunk + METHOD method_16569 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Ljava/util/List;Lnet/minecraft/class_2791;)V + ARG 0 world + ARG 1 generator + ARG 2 surroundingChunks + ARG 3 chunk + METHOD method_16570 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Ljava/util/List;Lnet/minecraft/class_2791;)V + ARG 0 world + ARG 1 generator + ARG 2 surroundingChunks + ARG 3 chunk + METHOD method_17033 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Ljava/util/List;Lnet/minecraft/class_2791;)V + ARG 0 world + ARG 1 generator + ARG 2 surroundingChunks + ARG 3 chunk + METHOD method_17034 (Lnet/minecraft/class_2806;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;)Ljava/util/concurrent/CompletableFuture; + ARG 0 targetStatus + ARG 1 world + ARG 2 generator + ARG 3 structureManager + ARG 4 lightingProvider + ARG 6 surroundingChunks + ARG 7 chunk + METHOD method_17036 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Ljava/util/List;Lnet/minecraft/class_2791;)V + ARG 0 world + ARG 1 generator + ARG 2 surroundingChunks + ARG 3 chunk METHOD method_20608 shouldExcludeBlockLight (Lnet/minecraft/class_2806;Lnet/minecraft/class_2791;)Z ARG 0 status ARG 1 chunk + METHOD method_20609 (Lnet/minecraft/class_2806;Lnet/minecraft/class_3218;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 status + ARG 1 world + ARG 2 structureManager + ARG 3 lightingProvider + ARG 5 chunk METHOD method_20610 getLightingFuture (Lnet/minecraft/class_2806;Lnet/minecraft/class_3227;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 0 status ARG 1 lightingProvider @@ -65,14 +146,61 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 3 heightMapTypes ARG 4 chunkType ARG 5 task - METHOD method_20612 runNoGenTask (Lnet/minecraft/class_3218;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; - CLASS class_2807 Task + ARG 6 loadTask + METHOD method_20612 runLoadTask (Lnet/minecraft/class_3218;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 1 world + ARG 2 structureManager + ARG 3 lightingProvider + ARG 5 chunk + METHOD method_20613 (Lnet/minecraft/class_2806;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;)Ljava/util/concurrent/CompletableFuture; + ARG 0 targetStatus + ARG 1 world + ARG 2 generator + ARG 3 structureManager + ARG 4 lightingProvider + ARG 6 surroundingChunks + ARG 7 chunk + METHOD method_20614 (Lnet/minecraft/class_2806;Lnet/minecraft/class_3218;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 status + ARG 1 world + ARG 2 structureManager + ARG 3 lightingProvider + ARG 5 chunk + METHOD method_20615 (Lnet/minecraft/class_2806;Lnet/minecraft/class_3218;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 targetStatus + ARG 1 world + ARG 2 structureManager + ARG 3 lightingProvider + ARG 5 chunk + CLASS class_2807 GenerationTask + COMMENT A task called when a chunk needs to be generated. METHOD doWork (Lnet/minecraft/class_2806;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;)Ljava/util/concurrent/CompletableFuture; ARG 1 targetStatus + COMMENT the status the chunk will be set to after the task is completed + ARG 2 world ARG 3 generator + ARG 4 structureManager + ARG 5 lightingProvider + ARG 7 surroundingChunks + ARG 8 chunk + COMMENT the primary chunk this task will be applied to CLASS class_2808 ChunkType - CLASS class_3768 SimpleTask + COMMENT Specifies the type of a chunk + FIELD field_12807 Lnet/minecraft/class_2806$class_2808; + COMMENT A chunk which is complete and bound to a world. + FIELD field_12808 Lnet/minecraft/class_2806$class_2808; + COMMENT A chunk which is incomplete and not loaded to the world yet. + CLASS class_3768 SimpleGenerationTask METHOD doWork (Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Ljava/util/List;Lnet/minecraft/class_2791;)V + ARG 1 world ARG 2 generator + ARG 3 surroundingChunks ARG 4 chunk - CLASS class_4305 NoGenTask + CLASS class_4305 LoadTask + COMMENT A task called when a chunk is loaded but does not need to be generated. + METHOD doWork (Lnet/minecraft/class_2806;Lnet/minecraft/class_3218;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 1 targetStatus + ARG 2 world + ARG 3 structureManager + ARG 4 lightingProvider + ARG 6 chunk diff --git a/mappings/net/minecraft/world/chunk/EmptyChunk.mapping b/mappings/net/minecraft/world/chunk/EmptyChunk.mapping index 97d2cade26..25c67e609b 100644 --- a/mappings/net/minecraft/world/chunk/EmptyChunk.mapping +++ b/mappings/net/minecraft/world/chunk/EmptyChunk.mapping @@ -2,3 +2,4 @@ CLASS net/minecraft/class_2812 net/minecraft/world/chunk/EmptyChunk FIELD field_12814 BIOMES [Lnet/minecraft/class_1959; METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1923;)V ARG 1 world + ARG 2 pos diff --git a/mappings/net/minecraft/world/chunk/PalettedContainer.mapping b/mappings/net/minecraft/world/chunk/PalettedContainer.mapping index 8f888528e3..69adfd4576 100644 --- a/mappings/net/minecraft/world/chunk/PalettedContainer.mapping +++ b/mappings/net/minecraft/world/chunk/PalettedContainer.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_2841 net/minecraft/world/chunk/PalettedContainer FIELD field_12934 paletteSize I + FIELD field_12935 defaultValue Ljava/lang/Object; FIELD field_12936 palette Lnet/minecraft/class_2837; FIELD field_12937 writeLock Ljava/util/concurrent/locks/ReentrantLock; FIELD field_12938 idList Lnet/minecraft/class_2361; @@ -41,6 +42,11 @@ CLASS net/minecraft/class_2841 net/minecraft/world/chunk/PalettedContainer METHOD method_12330 write (Lnet/minecraft/class_2487;Ljava/lang/String;Ljava/lang/String;)V METHOD method_12331 get (I)Ljava/lang/Object; ARG 1 index + METHOD method_12332 (Ljava/lang/Thread;)Ljava/lang/String; + ARG 0 thread + METHOD method_12333 (ILjava/lang/Object;)I + ARG 0 newSize + ARG 1 added METHOD method_12334 lock ()V METHOD method_12335 unlock ()V METHOD method_12336 setAndGetOldValue (ILjava/lang/Object;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/world/chunk/ProtoChunk.mapping b/mappings/net/minecraft/world/chunk/ProtoChunk.mapping index a3d40b53bf..cf8bbd2c7d 100644 --- a/mappings/net/minecraft/world/chunk/ProtoChunk.mapping +++ b/mappings/net/minecraft/world/chunk/ProtoChunk.mapping @@ -20,13 +20,26 @@ CLASS net/minecraft/class_2839 net/minecraft/world/chunk/ProtoChunk FIELD field_12930 structureReferences Ljava/util/Map; FIELD field_17105 lightingProvider Lnet/minecraft/class_3568; FIELD field_20656 biomes Lnet/minecraft/class_4548; + METHOD (Lnet/minecraft/class_1923;Lnet/minecraft/class_2843;)V + ARG 1 pos + ARG 2 upgradeData METHOD (Lnet/minecraft/class_1923;Lnet/minecraft/class_2843;[Lnet/minecraft/class_2826;Lnet/minecraft/class_2850;Lnet/minecraft/class_2850;)V + ARG 1 pos + ARG 2 upgradeData + ARG 3 sections ARG 4 blockTickScheduler ARG 5 fluidTickScheduler METHOD method_12023 getLightingProvider ()Lnet/minecraft/class_3568; METHOD method_12025 getCarvingMask (Lnet/minecraft/class_2893$class_2894;)Ljava/util/BitSet; + ARG 1 carver METHOD method_12295 getEntities ()Ljava/util/List; METHOD method_12296 getLightSourcesBySection ()[Lit/unimi/dsi/fastutil/shorts/ShortList; + METHOD method_12297 (Lnet/minecraft/class_2893$class_2894;)Ljava/util/BitSet; + ARG 0 carver + METHOD method_12298 (Lnet/minecraft/class_3195;)Lit/unimi/dsi/fastutil/longs/LongSet; + ARG 0 structure + METHOD method_12299 (Lnet/minecraft/class_2902$class_2903;)Lnet/minecraft/class_2902; + ARG 1 type METHOD method_12300 getPackedSectionRelative (Lnet/minecraft/class_2338;)S ARG 0 pos METHOD method_12302 addEntity (Lnet/minecraft/class_2487;)V @@ -34,12 +47,18 @@ CLASS net/minecraft/class_2839 net/minecraft/world/chunk/ProtoChunk METHOD method_12304 addLightSource (SI)V ARG 1 chunkSliceRel ARG 2 sectionY + METHOD method_12305 (Lnet/minecraft/class_3195;)Lit/unimi/dsi/fastutil/longs/LongSet; + ARG 0 structure METHOD method_12307 setCarvingMask (Lnet/minecraft/class_2893$class_2894;Ljava/util/BitSet;)V ARG 1 carver ARG 2 mask METHOD method_12308 setStatus (Lnet/minecraft/class_2806;)V ARG 1 status METHOD method_12309 getBlockEntities ()Ljava/util/Map; + METHOD method_12310 (Lnet/minecraft/class_3611;)Z + ARG 0 fluid + METHOD method_12311 (Lnet/minecraft/class_2248;)Z + ARG 0 block METHOD method_12314 joinBlockPos (SILnet/minecraft/class_1923;)Lnet/minecraft/class_2338; ARG 0 sectionRel ARG 1 sectionY @@ -50,4 +69,8 @@ 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 + ARG 1 lightingProvider METHOD method_22405 setBiomes (Lnet/minecraft/class_4548;)V + ARG 1 biomes + METHOD method_28510 getOrCreateCarvingMask (Lnet/minecraft/class_2893$class_2894;)Ljava/util/BitSet; + ARG 1 carver diff --git a/mappings/net/minecraft/world/chunk/ReadOnlyChunk.mapping b/mappings/net/minecraft/world/chunk/ReadOnlyChunk.mapping index bd179801a3..e140d6cc1f 100644 --- a/mappings/net/minecraft/world/chunk/ReadOnlyChunk.mapping +++ b/mappings/net/minecraft/world/chunk/ReadOnlyChunk.mapping @@ -1,7 +1,12 @@ CLASS net/minecraft/class_2821 net/minecraft/world/chunk/ReadOnlyChunk + COMMENT Represents a read only view of a world chunk used in world generation. FIELD field_12866 wrapped Lnet/minecraft/class_2818; METHOD (Lnet/minecraft/class_2818;)V ARG 1 wrapped METHOD method_12239 transformHeightmapType (Lnet/minecraft/class_2902$class_2903;)Lnet/minecraft/class_2902$class_2903; ARG 1 type METHOD method_12240 getWrappedChunk ()Lnet/minecraft/class_2818; + METHOD method_12241 (Lnet/minecraft/class_3611;)Z + ARG 0 fluid + METHOD method_12242 (Lnet/minecraft/class_2248;)Z + ARG 0 block diff --git a/mappings/net/minecraft/world/chunk/WorldChunk.mapping b/mappings/net/minecraft/world/chunk/WorldChunk.mapping index 1687bb007c..e8ac00c40b 100644 --- a/mappings/net/minecraft/world/chunk/WorldChunk.mapping +++ b/mappings/net/minecraft/world/chunk/WorldChunk.mapping @@ -44,6 +44,7 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk 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; ARG 1 pos + ARG 2 creationType METHOD method_12203 remove (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_12204 loadBlockEntity (Lnet/minecraft/class_2338;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2586; @@ -53,6 +54,7 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk ARG 1 except ARG 2 box ARG 3 entityList + ARG 4 predicate METHOD method_12206 loadToWorld ()V METHOD method_12207 setLevelTypeProvider (Ljava/util/function/Supplier;)V ARG 1 levelTypeProvider @@ -61,24 +63,32 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk METHOD method_12210 getEntities (Ljava/lang/Class;Lnet/minecraft/class_238;Ljava/util/List;Ljava/util/function/Predicate;)V ARG 1 entityClass ARG 2 box - ARG 3 result + ARG 3 entityList ARG 4 predicate + METHOD method_12212 (Lnet/minecraft/class_3195;)Lit/unimi/dsi/fastutil/longs/LongSet; + ARG 0 structure METHOD method_12214 getBlockEntities ()Ljava/util/Map; METHOD method_12215 getEntitySectionArray ()[Lnet/minecraft/class_3509; METHOD method_12216 addBlockEntity (Lnet/minecraft/class_2586;)V + ARG 1 blockEntity METHOD method_12219 remove (Lnet/minecraft/class_1297;I)V ARG 1 entity ARG 2 section METHOD method_12220 markDirty ()V METHOD method_12221 runPostProcessing ()V + METHOD method_12222 (Lnet/minecraft/class_3195;)Lit/unimi/dsi/fastutil/longs/LongSet; + ARG 0 structure METHOD method_12223 isEmpty ()Z METHOD method_12224 loadFromPacket (Lnet/minecraft/class_4548;Lnet/minecraft/class_2540;Lnet/minecraft/class_2487;I)V ARG 1 biomes ARG 2 buf ARG 3 tag + ARG 4 verticalStripBitmask METHOD method_12225 getLevelType ()Lnet/minecraft/class_3193$class_3194; METHOD method_12226 setLoadedToWorld (Z)V ARG 1 loaded + METHOD method_12231 (Lnet/minecraft/class_2902$class_2903;)Lnet/minecraft/class_2902; + ARG 1 type METHOD method_12232 setUnsaved (Z)V ARG 1 unsaved METHOD method_12234 getFluidState (III)Lnet/minecraft/class_3610; @@ -88,8 +98,14 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk 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 - ARG 3 list + ARG 3 entityList ARG 4 predicate + METHOD method_18089 (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1297; + ARG 1 entity + METHOD method_18319 (ILnet/minecraft/class_2338;)Z + ARG 1 pos + METHOD method_18320 (Lnet/minecraft/class_2338;)Z + ARG 0 pos METHOD method_20471 enableTickSchedulers (Lnet/minecraft/class_3218;)V ARG 1 world METHOD method_20530 disableTickSchedulers ()V diff --git a/mappings/net/minecraft/world/gen/StructureAccessor.mapping b/mappings/net/minecraft/world/gen/StructureAccessor.mapping index 22e94c39aa..df4f11f8f3 100644 --- a/mappings/net/minecraft/world/gen/StructureAccessor.mapping +++ b/mappings/net/minecraft/world/gen/StructureAccessor.mapping @@ -1,4 +1,13 @@ CLASS net/minecraft/class_5138 net/minecraft/world/gen/StructureAccessor + FIELD field_24404 world Lnet/minecraft/class_1936; + FIELD field_24497 options Lnet/minecraft/class_5285; + METHOD (Lnet/minecraft/class_1936;Lnet/minecraft/class_5285;)V + ARG 1 world + ARG 2 options + METHOD method_26971 (Lnet/minecraft/class_3195;Lnet/minecraft/class_4076;)Lnet/minecraft/class_3449; + ARG 2 pos + METHOD method_26972 (Lnet/minecraft/class_3449;)Z + ARG 0 structureStart METHOD method_26973 addStructureReference (Lnet/minecraft/class_4076;Lnet/minecraft/class_3195;JLnet/minecraft/class_2810;)V ARG 1 pos ARG 2 feature @@ -16,3 +25,14 @@ CLASS net/minecraft/class_5138 net/minecraft/world/gen/StructureAccessor ARG 2 feature ARG 3 structureStart ARG 4 holder + METHOD method_26977 (Ljava/lang/Long;)Lnet/minecraft/class_4076; + ARG 0 pos + METHOD method_27834 shouldGenerateStructures ()Z + METHOD method_28386 (Lnet/minecraft/class_2338;Lnet/minecraft/class_3443;)Z + ARG 1 piece + METHOD method_28387 (Lnet/minecraft/class_2338;Lnet/minecraft/class_3449;)Z + ARG 1 structureStart + METHOD method_28389 (ZLnet/minecraft/class_2338;Lnet/minecraft/class_3449;)Z + ARG 2 structureStart + METHOD method_29951 (Lnet/minecraft/class_3233;)Lnet/minecraft/class_5138; + ARG 1 region