From 1e952a0178bfb812ee56b5dfc34c6fba0bc3765f Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Wed, 30 Mar 2022 18:48:16 +0900 Subject: [PATCH] 22w12a world (#3061) --- .../server/world/ServerWorld.mapping | 6 +++++ .../net/minecraft/world/ChunkRegion.mapping | 3 +++ .../net/minecraft/world/WorldAccess.mapping | 6 ++--- .../net/minecraft/world/WorldView.mapping | 3 +++ .../ChainRestrictedNeighborUpdater.mapping | 3 +++ .../world/block/NeighborUpdater.mapping | 11 ++++---- .../world/block/SimpleNeighborUpdater.mapping | 2 ++ .../world/storage/StorageIoWorker.mapping | 25 +++++++++++++++++++ .../storage/VersionedChunkStorage.mapping | 3 +++ 9 files changed, 54 insertions(+), 8 deletions(-) diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index 2406b50cde..19b699283b 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -352,6 +352,12 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld ARG 1 pos METHOD method_39999 shouldTick (Lnet/minecraft/class_2338;)Z ARG 1 pos + METHOD method_42108 locateBiome (Ljava/util/function/Predicate;Lnet/minecraft/class_2338;III)Lcom/mojang/datafixers/util/Pair; + ARG 1 predicate + ARG 2 pos + ARG 3 radius + ARG 4 horizontalBlockCheckInterval + ARG 5 verticalBlockCheckInterval METHOD method_8448 updateSleepingPlayers ()V METHOD method_8487 locateStructure (Lnet/minecraft/class_6862;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338; COMMENT Tries to find the closest structure of a given type near a given block. diff --git a/mappings/net/minecraft/world/ChunkRegion.mapping b/mappings/net/minecraft/world/ChunkRegion.mapping index ffc0f5c3d5..e0baf18a6c 100644 --- a/mappings/net/minecraft/world/ChunkRegion.mapping +++ b/mappings/net/minecraft/world/ChunkRegion.mapping @@ -37,3 +37,6 @@ CLASS net/minecraft/class_3233 net/minecraft/world/ChunkRegion METHOD method_14340 (Lnet/minecraft/class_2338;)Lnet/minecraft/class_6763; ARG 1 pos METHOD method_33561 getCenterPos ()Lnet/minecraft/class_1923; + METHOD method_42109 needsBlending (Lnet/minecraft/class_1923;I)Z + ARG 1 chunkPos + ARG 2 checkRadius diff --git a/mappings/net/minecraft/world/WorldAccess.mapping b/mappings/net/minecraft/world/WorldAccess.mapping index 481678c222..94ae09530a 100644 --- a/mappings/net/minecraft/world/WorldAccess.mapping +++ b/mappings/net/minecraft/world/WorldAccess.mapping @@ -43,11 +43,11 @@ CLASS net/minecraft/class_1936 net/minecraft/world/WorldAccess ARG 2 type ARG 3 delay ARG 4 priority - METHOD method_42308 updateState (Lnet/minecraft/class_2350;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;II)V + METHOD method_42308 replaceWithStateForNeighborUpdate (Lnet/minecraft/class_2350;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;II)V ARG 1 direction - ARG 2 state + ARG 2 neighborState ARG 3 pos - ARG 4 sourcePos + ARG 4 neighborPos ARG 5 flags ARG 6 maxUpdateDepth METHOD method_8396 playSound (Lnet/minecraft/class_1657;Lnet/minecraft/class_2338;Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FF)V diff --git a/mappings/net/minecraft/world/WorldView.mapping b/mappings/net/minecraft/world/WorldView.mapping index 201522053a..d5e75d6410 100644 --- a/mappings/net/minecraft/world/WorldView.mapping +++ b/mappings/net/minecraft/world/WorldView.mapping @@ -39,6 +39,7 @@ CLASS net/minecraft/class_4538 net/minecraft/world/WorldView COMMENT @see BlockRenderView#isSkyVisible ARG 1 pos METHOD method_22349 getBrightness (Lnet/minecraft/class_2338;)F + ARG 1 pos METHOD method_22350 getChunk (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2791; COMMENT {@return the chunk that contains {@code pos}} ARG 1 pos @@ -61,6 +62,8 @@ CLASS net/minecraft/class_4538 net/minecraft/world/WorldView METHOD method_33598 isPosLoaded (II)Z ARG 1 x ARG 2 z + METHOD method_42309 getPhototaxisFavor (Lnet/minecraft/class_2338;)F + ARG 1 pos METHOD method_8392 getChunk (II)Lnet/minecraft/class_2791; COMMENT {@return the chunk with position {@code chunkX} and {@code chunkZ}} ARG 1 chunkX diff --git a/mappings/net/minecraft/world/block/ChainRestrictedNeighborUpdater.mapping b/mappings/net/minecraft/world/block/ChainRestrictedNeighborUpdater.mapping index 0ec10238f3..b6037ed6e1 100644 --- a/mappings/net/minecraft/world/block/ChainRestrictedNeighborUpdater.mapping +++ b/mappings/net/minecraft/world/block/ChainRestrictedNeighborUpdater.mapping @@ -34,3 +34,6 @@ CLASS net/minecraft/class_7159 net/minecraft/world/block/ChainRestrictedNeighbor FIELD comp_591 sourcePos Lnet/minecraft/class_2338; METHOD comp_590 sourceBlock ()Lnet/minecraft/class_2248; METHOD comp_591 sourcePos ()Lnet/minecraft/class_2338; + CLASS class_7272 StateReplacementEntry + FIELD comp_667 neighborState Lnet/minecraft/class_2680; + METHOD comp_667 neighborState ()Lnet/minecraft/class_2680; diff --git a/mappings/net/minecraft/world/block/NeighborUpdater.mapping b/mappings/net/minecraft/world/block/NeighborUpdater.mapping index 30298167db..4aa1a7672f 100644 --- a/mappings/net/minecraft/world/block/NeighborUpdater.mapping +++ b/mappings/net/minecraft/world/block/NeighborUpdater.mapping @@ -21,17 +21,18 @@ CLASS net/minecraft/class_7165 net/minecraft/world/block/NeighborUpdater ARG 3 sourceBlock ARG 4 sourcePos ARG 5 notify - METHOD method_42392 updateNeighbor (Lnet/minecraft/class_2350;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;II)V + METHOD method_42392 replaceWithStateForNeighborUpdate (Lnet/minecraft/class_2350;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;II)V ARG 1 direction - ARG 2 state + ARG 2 neighborState ARG 3 pos ARG 4 neighborPos ARG 5 flags - METHOD method_42393 updateState (Lnet/minecraft/class_1936;Lnet/minecraft/class_2350;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;II)V + ARG 6 maxUpdateDepth + METHOD method_42393 replaceWithStateForNeighborUpdate (Lnet/minecraft/class_1936;Lnet/minecraft/class_2350;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;II)V ARG 0 world ARG 1 direction - ARG 2 state + ARG 2 neighborState ARG 3 pos - ARG 4 sourcePos + ARG 4 neighborPos ARG 5 flags ARG 6 maxUpdateDepth diff --git a/mappings/net/minecraft/world/block/SimpleNeighborUpdater.mapping b/mappings/net/minecraft/world/block/SimpleNeighborUpdater.mapping index 299b7ade24..9f0cb7802b 100644 --- a/mappings/net/minecraft/world/block/SimpleNeighborUpdater.mapping +++ b/mappings/net/minecraft/world/block/SimpleNeighborUpdater.mapping @@ -1,2 +1,4 @@ CLASS net/minecraft/class_7164 net/minecraft/world/block/SimpleNeighborUpdater FIELD field_37838 world Lnet/minecraft/class_1937; + METHOD (Lnet/minecraft/class_1937;)V + ARG 1 world diff --git a/mappings/net/minecraft/world/storage/StorageIoWorker.mapping b/mappings/net/minecraft/world/storage/StorageIoWorker.mapping index 30c9dceade..6a5cd56095 100644 --- a/mappings/net/minecraft/world/storage/StorageIoWorker.mapping +++ b/mappings/net/minecraft/world/storage/StorageIoWorker.mapping @@ -4,6 +4,8 @@ CLASS net/minecraft/class_4698 net/minecraft/world/storage/StorageIoWorker FIELD field_21499 storage Lnet/minecraft/class_2867; FIELD field_21500 results Ljava/util/Map; FIELD field_24468 executor Lnet/minecraft/class_3846; + FIELD field_38240 blendingStatusCaches Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap; + FIELD field_38241 MAX_CACHE_SIZE I METHOD (Ljava/nio/file/Path;ZLjava/lang/String;)V ARG 1 directory ARG 2 dsync @@ -20,10 +22,33 @@ CLASS net/minecraft/class_4698 net/minecraft/world/storage/StorageIoWorker ARG 2 nbt METHOD method_23709 run (Ljava/util/function/Supplier;)Ljava/util/concurrent/CompletableFuture; ARG 1 task + METHOD method_23711 (Lnet/minecraft/class_2487;Lnet/minecraft/class_1923;)Lnet/minecraft/class_4698$class_4699; + ARG 1 pos2 METHOD method_23719 writeResult ()V + METHOD method_27938 (Lnet/minecraft/class_3906;)Lnet/minecraft/class_3847$class_3907; + ARG 0 listener + METHOD method_27940 (Ljava/lang/Void;)Ljava/util/concurrent/CompletionStage; + ARG 1 void_ + METHOD method_27941 (Ljava/util/function/Supplier;Lnet/minecraft/class_3906;)Lnet/minecraft/class_3847$class_3907; + ARG 2 listener METHOD method_27945 writeRemainingResults ()V METHOD method_31738 readChunkData (Lnet/minecraft/class_1923;)Ljava/util/concurrent/CompletableFuture; ARG 1 pos + METHOD method_37479 (Ljava/lang/Void;)Ljava/util/concurrent/CompletionStage; + ARG 1 void_ + METHOD method_42329 getOrComputeBlendingStatus (II)Ljava/util/concurrent/CompletableFuture; + ARG 1 chunkX + ARG 2 chunkZ + METHOD method_42330 needsBlending (Lnet/minecraft/class_1923;I)Z + ARG 1 chunkPos + ARG 2 checkRadius + METHOD method_42331 (Ljava/util/BitSet;Lnet/minecraft/class_1923;)V + ARG 2 chunkPos + METHOD method_42332 needsBlending (Lnet/minecraft/class_2487;)Z + ARG 1 nbt + METHOD method_42333 computeBlendingStatus (II)Ljava/util/concurrent/CompletableFuture; + ARG 1 chunkX + ARG 2 chunkZ CLASS class_4699 Result FIELD field_21503 nbt Lnet/minecraft/class_2487; FIELD field_21504 future Ljava/util/concurrent/CompletableFuture; diff --git a/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping index e8960e896f..de2436a093 100644 --- a/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping +++ b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping @@ -26,3 +26,6 @@ CLASS net/minecraft/class_3977 net/minecraft/world/storage/VersionedChunkStorage ARG 1 worldKey ARG 2 generatorCodecKey METHOD method_39800 getWorker ()Lnet/minecraft/class_6830; + METHOD method_42328 needsBlending (Lnet/minecraft/class_1923;I)Z + ARG 1 chunkPos + ARG 2 checkRadius