diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index db033a7f7a..3d9ca42019 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -462,6 +462,10 @@ CLASS net/minecraft/server/MinecraftServer ARG 1 player ARG 2 type METHOD method_56626 shouldPushTickTimeLog ()Z + METHOD method_57821 onChunkLoadFailure (Lnet/minecraft/class_1923;)V + ARG 1 pos + METHOD method_57822 onChunkSaveFailure (Lnet/minecraft/class_1923;)V + ARG 1 pos CLASS class_6414 DebugStart FIELD field_33980 time J FIELD field_33981 tick I diff --git a/mappings/net/minecraft/world/ChunkSerializer.mapping b/mappings/net/minecraft/world/ChunkSerializer.mapping index f9be226314..8ad618a882 100644 --- a/mappings/net/minecraft/world/ChunkSerializer.mapping +++ b/mappings/net/minecraft/world/ChunkSerializer.mapping @@ -72,3 +72,6 @@ CLASS net/minecraft/class_2852 net/minecraft/world/ChunkSerializer ARG 1 key METHOD method_39797 (Lnet/minecraft/class_2499;Lnet/minecraft/class_3218;Lnet/minecraft/class_2499;Lnet/minecraft/class_2818;)V ARG 3 chunk + CLASS class_9314 ChunkLoadingException + METHOD (Ljava/lang/String;)V + ARG 1 message diff --git a/mappings/net/minecraft/world/CommandBlockExecutor.mapping b/mappings/net/minecraft/world/CommandBlockExecutor.mapping index 96d8cb63a1..51209217e1 100644 --- a/mappings/net/minecraft/world/CommandBlockExecutor.mapping +++ b/mappings/net/minecraft/world/CommandBlockExecutor.mapping @@ -27,9 +27,14 @@ CLASS net/minecraft/class_1918 net/minecraft/world/CommandBlockExecutor ARG 1 lastOutput METHOD method_8292 getLastOutput ()Lnet/minecraft/class_2561; METHOD method_8293 getWorld ()Lnet/minecraft/class_3218; + METHOD method_8294 (ZI)V + ARG 1 successful + ARG 2 returnValue METHOD method_8295 markDirty ()V METHOD method_8296 isTrackingOutput ()Z METHOD method_8297 writeNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487; + ARG 1 nbt + ARG 2 registries METHOD method_8298 setSuccessCount (I)V ARG 1 successCount METHOD method_8299 getCustomName ()Lnet/minecraft/class_2561; @@ -39,3 +44,5 @@ CLASS net/minecraft/class_1918 net/minecraft/world/CommandBlockExecutor METHOD method_8303 getSource ()Lnet/minecraft/class_2168; METHOD method_8304 getSuccessCount ()I METHOD method_8305 readNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)V + ARG 1 nbt + ARG 2 registries diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 617ab4822b..5ab4f4f3bf 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -504,6 +504,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 7 velocityX ARG 9 velocityY ARG 11 velocityZ + ARG 13 explosions METHOD method_8558 isValidHorizontally (Lnet/minecraft/class_2338;)Z ARG 0 pos CLASS class_7867 ExplosionSourceType diff --git a/mappings/net/minecraft/world/chunk/ChunkGenerating.mapping b/mappings/net/minecraft/world/chunk/ChunkGenerating.mapping new file mode 100644 index 0000000000..4540bad330 --- /dev/null +++ b/mappings/net/minecraft/world/chunk/ChunkGenerating.mapping @@ -0,0 +1,120 @@ +CLASS net/minecraft/class_9310 net/minecraft/world/chunk/ChunkGenerating + METHOD method_57594 initializeLight (Lnet/minecraft/class_3227;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 lightingProvider + ARG 1 chunk + METHOD method_57595 isLightOn (Lnet/minecraft/class_2791;)Z + ARG 0 chunk + METHOD method_57596 noop (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Lnet/minecraft/class_9311;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 status + ARG 2 fullChunkConverter + ARG 3 chunk + METHOD method_57597 noop (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_9311;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 status + ARG 2 executor + ARG 3 fullChunkConverter + ARG 4 chunks + ARG 5 chunk + METHOD method_57598 light (Lnet/minecraft/class_3227;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 lightingProvider + ARG 1 chunk + METHOD method_57599 (Lnet/minecraft/class_2791;)Lnet/minecraft/class_2791; + ARG 0 populated + METHOD method_57600 loadStructures (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Lnet/minecraft/class_9311;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 status + ARG 2 fullChunkConverter + ARG 3 chunk + METHOD method_57601 generateStructures (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_9311;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 status + ARG 2 executor + ARG 3 fullChunkConverter + ARG 4 chunks + ARG 5 chunk + METHOD method_57602 initializeLight (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Lnet/minecraft/class_9311;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 status + ARG 2 fullChunkConverter + ARG 3 chunk + METHOD method_57603 generateStructureReferences (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_9311;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 status + ARG 2 executor + ARG 3 fullChunkConverter + ARG 4 chunks + ARG 5 chunk + METHOD method_57604 light (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Lnet/minecraft/class_9311;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 status + ARG 2 fullChunkConverter + ARG 3 chunk + METHOD method_57605 populateBiomes (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_9311;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 status + ARG 2 executor + ARG 3 fullChunkConverter + ARG 4 chunks + ARG 5 chunk + METHOD method_57606 convertToFull (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Lnet/minecraft/class_9311;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 status + ARG 2 fullChunkConverter + ARG 3 chunk + METHOD method_57607 populateNoise (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_9311;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 status + ARG 2 executor + ARG 3 fullChunkConverter + ARG 4 chunks + ARG 5 chunk + METHOD method_57608 buildSurface (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_9311;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 status + ARG 2 executor + ARG 3 fullChunkConverter + ARG 4 chunks + ARG 5 chunk + METHOD method_57609 carve (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_9311;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 status + ARG 2 executor + ARG 3 fullChunkConverter + ARG 4 chunks + ARG 5 chunk + METHOD method_57610 generateFeatures (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_9311;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 status + ARG 2 executor + ARG 3 fullChunkConverter + ARG 4 chunks + ARG 5 chunk + METHOD method_57611 initializeLight (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_9311;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 status + ARG 2 executor + ARG 3 fullChunkConverter + ARG 4 chunks + ARG 5 chunk + METHOD method_57612 light (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_9311;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 status + ARG 2 executor + ARG 3 fullChunkConverter + ARG 4 chunks + ARG 5 chunk + METHOD method_57613 generateEntities (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_9311;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 status + ARG 2 executor + ARG 3 fullChunkConverter + ARG 4 chunks + ARG 5 chunk + METHOD method_57614 convertToFull (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_9311;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 status + ARG 2 executor + ARG 3 fullChunkConverter + ARG 4 chunks + ARG 5 chunk diff --git a/mappings/net/minecraft/world/chunk/ChunkGenerationContext.mapping b/mappings/net/minecraft/world/chunk/ChunkGenerationContext.mapping new file mode 100644 index 0000000000..7d361c3bfa --- /dev/null +++ b/mappings/net/minecraft/world/chunk/ChunkGenerationContext.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_9312 net/minecraft/world/chunk/ChunkGenerationContext + FIELD comp_2434 world Lnet/minecraft/class_3218; + FIELD comp_2437 lightingProvider Lnet/minecraft/class_3227; + METHOD comp_2434 world ()Lnet/minecraft/class_3218; + METHOD comp_2437 lightingProvider ()Lnet/minecraft/class_3227; diff --git a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping index 0198459185..dcbc5dc081 100644 --- a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping @@ -21,6 +21,10 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 7 loadTask METHOD method_12152 getTaskMargin ()I METHOD method_12154 runGenerationTask (Lnet/minecraft/class_9312;Ljava/util/concurrent/Executor;Lnet/minecraft/class_9311;Ljava/util/List;)Ljava/util/concurrent/CompletableFuture; + ARG 1 context + ARG 2 executor + ARG 3 fullChunkConverter + ARG 4 chunks METHOD method_12155 getMaxDistanceFromFull ()I METHOD method_12160 getHeightmapTypes ()Ljava/util/EnumSet; METHOD method_12161 byDistanceFromFull (I)Lnet/minecraft/class_2806; @@ -47,8 +51,25 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 6 generationTask ARG 7 loadTask METHOD method_20612 runLoadTask (Lnet/minecraft/class_9312;Lnet/minecraft/class_9311;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 1 context + ARG 2 fullChunkConverter + ARG 3 chunk METHOD method_51378 shouldAlwaysUpgrade ()Z + METHOD method_57593 (Lnet/minecraft/class_6613;Lnet/minecraft/class_2791;)Lnet/minecraft/class_2791; + ARG 2 chunk CLASS class_2807 GenerationTask COMMENT A task called when a chunk needs to be generated. + METHOD doWork (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_9311;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 1 context + ARG 2 status + ARG 3 executor + ARG 4 fullChunkConverter + ARG 5 chunks + ARG 6 chunk 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_9312;Lnet/minecraft/class_2806;Lnet/minecraft/class_9311;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 1 context + ARG 2 status + ARG 3 fullChunkConverter + ARG 4 chunk diff --git a/mappings/net/minecraft/world/chunk/FullChunkConverter.mapping b/mappings/net/minecraft/world/chunk/FullChunkConverter.mapping new file mode 100644 index 0000000000..2977de654b --- /dev/null +++ b/mappings/net/minecraft/world/chunk/FullChunkConverter.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_9311 net/minecraft/world/chunk/FullChunkConverter + METHOD apply (Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 1 chunk diff --git a/mappings/net/minecraft/world/gen/StructureAccessor.mapping b/mappings/net/minecraft/world/gen/StructureAccessor.mapping index d66efdde0c..159d2411fe 100644 --- a/mappings/net/minecraft/world/gen/StructureAccessor.mapping +++ b/mappings/net/minecraft/world/gen/StructureAccessor.mapping @@ -56,6 +56,7 @@ CLASS net/minecraft/class_5138 net/minecraft/world/gen/StructureAccessor ARG 2 structureStart METHOD method_41034 getStructureContaining (Lnet/minecraft/class_2338;Lnet/minecraft/class_6885;)Lnet/minecraft/class_3449; ARG 1 pos + ARG 2 structures METHOD method_41035 getStructureStarts (Lnet/minecraft/class_1923;Ljava/util/function/Predicate;)Ljava/util/List; ARG 1 pos ARG 2 predicate @@ -64,5 +65,11 @@ CLASS net/minecraft/class_5138 net/minecraft/world/gen/StructureAccessor ARG 1 pos METHOD method_41413 getStructureContaining (Lnet/minecraft/class_2338;Ljava/util/function/Predicate;)Lnet/minecraft/class_3449; ARG 1 pos + ARG 2 predicate METHOD method_41414 (Lnet/minecraft/class_2378;Ljava/util/function/Predicate;Lnet/minecraft/class_3195;)Z ARG 2 structure + METHOD method_57559 (Lnet/minecraft/class_6862;Lnet/minecraft/class_6880;)Z + ARG 1 structure + METHOD method_57560 getStructureContaining (Lnet/minecraft/class_2338;Lnet/minecraft/class_6862;)Lnet/minecraft/class_3449; + ARG 1 pos + ARG 2 tag diff --git a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping index 64c7390e04..4762110ded 100644 --- a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage FIELD field_44951 DEFAULT_ALLOWED_SYMLINK_MATCHER Ljava/nio/file/PathMatcher; FIELD field_44952 symlinkFinder Lnet/minecraft/class_8580; FIELD field_46830 MAX_LEVEL_DATA_SIZE I + FIELD field_49426 RECOMMENDED_USABLE_SPACE_BYTES I METHOD (Ljava/nio/file/Path;Ljava/nio/file/Path;Lnet/minecraft/class_8580;Lcom/mojang/datafixers/DataFixer;)V ARG 1 savesDirectory ARG 2 backupsDirectory @@ -132,6 +133,8 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage METHOD method_54546 readOldLevelProperties ()Lcom/mojang/serialization/Dynamic; METHOD method_54547 levelDatExists ()Z METHOD method_54548 tryRestoreBackup ()Z + METHOD method_57628 getUsableSpace ()J + METHOD method_57629 shouldShowUsableSpaceWarning ()Z CLASS 1 METHOD postVisitDirectory (Ljava/lang/Object;Ljava/io/IOException;)Ljava/nio/file/FileVisitResult; ARG 1 path