From 8805b2ba8e9c08205a9b6d00e3118fbd3b88d3a2 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Tue, 16 Mar 2021 04:56:31 +1100 Subject: [PATCH] some world stuff (#2143) * some world stuff * Update ChunkStatus.mapping * Update ChunkStatus.mapping --- .../world/BlockCollisionSpliterator.mapping | 3 ++ .../minecraft/world/MobSpawnerLogic.mapping | 3 ++ .../net/minecraft/world/SpawnHelper.mapping | 29 +++++++++++++++++ .../world/WanderingTraderManager.mapping | 6 ++++ mappings/net/minecraft/world/World.mapping | 3 ++ .../net/minecraft/world/biome/Biome.mapping | 2 ++ .../world/biome/DefaultBiomeCreator.mapping | 31 +++++++++++++++++++ .../world/biome/source/BiomeAccess.mapping | 4 +++ .../world/biome/source/BiomeArray.mapping | 15 +++++++++ .../world/biome/source/BiomeSource.mapping | 4 +++ .../world/border/WorldBorder.mapping | 1 + .../minecraft/world/chunk/ChunkStatus.mapping | 9 ++++-- .../minecraft/world/chunk/WorldChunk.mapping | 12 ++++++- .../world/explosion/Explosion.mapping | 6 ++++ .../net/minecraft/world/gen/YOffset.mapping | 1 + .../gen/chunk/ChunkGeneratorSettings.mapping | 1 + .../gen/feature/DefaultBiomeFeatures.mapping | 6 +++- 17 files changed, 132 insertions(+), 4 deletions(-) diff --git a/mappings/net/minecraft/world/BlockCollisionSpliterator.mapping b/mappings/net/minecraft/world/BlockCollisionSpliterator.mapping index 8f2eb08493..f4dcaf5e92 100644 --- a/mappings/net/minecraft/world/BlockCollisionSpliterator.mapping +++ b/mappings/net/minecraft/world/BlockCollisionSpliterator.mapping @@ -25,3 +25,6 @@ CLASS net/minecraft/class_5329 net/minecraft/world/BlockCollisionSpliterator ARG 1 box METHOD method_29285 offerBlockShape (Ljava/util/function/Consumer;)Z METHOD method_29286 offerEntityShape (Ljava/util/function/Consumer;)Z + METHOD method_30031 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)Z + ARG 0 state + ARG 1 pos diff --git a/mappings/net/minecraft/world/MobSpawnerLogic.mapping b/mappings/net/minecraft/world/MobSpawnerLogic.mapping index d991432e15..2ace4f5549 100644 --- a/mappings/net/minecraft/world/MobSpawnerLogic.mapping +++ b/mappings/net/minecraft/world/MobSpawnerLogic.mapping @@ -18,6 +18,9 @@ CLASS net/minecraft/class_1917 net/minecraft/world/MobSpawnerLogic ARG 1 world ARG 2 pos METHOD method_8272 writeNbt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 1 world + ARG 2 pos + ARG 3 nbt METHOD method_8273 sendStatus (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;I)V ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/world/SpawnHelper.mapping b/mappings/net/minecraft/world/SpawnHelper.mapping index cfd8c5c4ce..9e6c130bd3 100644 --- a/mappings/net/minecraft/world/SpawnHelper.mapping +++ b/mappings/net/minecraft/world/SpawnHelper.mapping @@ -33,6 +33,17 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper ARG 0 spawningChunkCount ARG 1 entities ARG 2 chunkSource + METHOD method_27816 (Lnet/minecraft/class_1311;)Z + ARG 0 spawnGroup + METHOD method_27817 (Lnet/minecraft/class_1948$class_5262;Lnet/minecraft/class_1299;Lnet/minecraft/class_2338;Lnet/minecraft/class_2791;)Z + ARG 1 entityType + ARG 2 pos + ARG 3 chunk + METHOD method_27818 (Lnet/minecraft/class_1948$class_5262;Lnet/minecraft/class_1308;Lnet/minecraft/class_2791;)V + ARG 1 entity + ARG 2 chunk + METHOD method_27819 (Lnet/minecraft/class_2338;Lnet/minecraft/class_1297;Lnet/minecraft/class_5263;Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;Lnet/minecraft/class_1311;Lnet/minecraft/class_2818;)V + ARG 5 chunk METHOD method_27821 spawn (Lnet/minecraft/class_3218;Lnet/minecraft/class_2818;Lnet/minecraft/class_1948$class_5262;ZZZ)V ARG 0 world ARG 1 chunk @@ -43,6 +54,13 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper METHOD method_27822 getBiomeDirectly (Lnet/minecraft/class_2338;Lnet/minecraft/class_2791;)Lnet/minecraft/class_1959; ARG 0 pos ARG 1 chunk + METHOD method_29950 getSpawnEntries (Lnet/minecraft/class_3218;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_1311;Lnet/minecraft/class_2338;Lnet/minecraft/class_1959;)Ljava/util/List; + ARG 0 world + ARG 1 structureAccessor + ARG 2 chunkGenerator + ARG 3 spawnGroup + ARG 4 pos + ARG 5 biome METHOD method_8657 getSpawnPos (Lnet/minecraft/class_1937;Lnet/minecraft/class_2818;)Lnet/minecraft/class_2338; ARG 0 world ARG 1 chunk @@ -53,6 +71,10 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper ARG 3 z METHOD method_8659 containsSpawnEntry (Lnet/minecraft/class_3218;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_1311;Lnet/minecraft/class_5483$class_1964;Lnet/minecraft/class_2338;)Z ARG 0 world + ARG 1 structureAccessor + ARG 2 chunkGenerator + ARG 3 spawnGroup + ARG 4 spawnEntry ARG 5 pos METHOD method_8660 canSpawn (Lnet/minecraft/class_1317$class_1319;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_1299;)Z ARG 0 location @@ -62,11 +84,14 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper METHOD method_8661 populateEntities (Lnet/minecraft/class_5425;Lnet/minecraft/class_1959;Lnet/minecraft/class_1923;Ljava/util/Random;)V ARG 0 world ARG 1 biome + ARG 2 chunkPos + ARG 3 random METHOD method_8662 isClearForSpawn (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3610;Lnet/minecraft/class_1299;)Z ARG 0 blockView ARG 1 pos ARG 2 state ARG 3 fluidState + ARG 4 entityType METHOD method_8663 spawnEntitiesInChunk (Lnet/minecraft/class_1311;Lnet/minecraft/class_3218;Lnet/minecraft/class_2818;Lnet/minecraft/class_1948$class_5261;Lnet/minecraft/class_1948$class_5259;)V ARG 0 group ARG 1 world @@ -75,6 +100,10 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper ARG 4 runner METHOD method_8664 pickRandomSpawnEntry (Lnet/minecraft/class_3218;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_1311;Ljava/util/Random;Lnet/minecraft/class_2338;)Ljava/util/Optional; ARG 0 world + ARG 1 structureAccessor + ARG 2 chunkGenerator + ARG 3 spawnGroup + ARG 4 random ARG 5 pos CLASS class_5259 Runner METHOD run (Lnet/minecraft/class_1308;Lnet/minecraft/class_2791;)V diff --git a/mappings/net/minecraft/world/WanderingTraderManager.mapping b/mappings/net/minecraft/world/WanderingTraderManager.mapping index 863506c49a..8ef9e4fdcd 100644 --- a/mappings/net/minecraft/world/WanderingTraderManager.mapping +++ b/mappings/net/minecraft/world/WanderingTraderManager.mapping @@ -9,9 +9,15 @@ CLASS net/minecraft/class_3990 net/minecraft/world/WanderingTraderManager METHOD method_18016 spawnLlama (Lnet/minecraft/class_3218;Lnet/minecraft/class_3989;I)V ARG 1 world ARG 2 wanderingTrader + ARG 3 range METHOD method_18017 getNearbySpawnPos (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;I)Lnet/minecraft/class_2338; ARG 1 world ARG 2 pos + ARG 3 range + METHOD method_18018 trySpawn (Lnet/minecraft/class_3218;)Z + ARG 1 world + METHOD method_19631 (Lnet/minecraft/class_2338;)Z + ARG 0 pos METHOD method_23279 doesNotSuffocateAt (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index bc9a91e29e..6d201fbe17 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -85,6 +85,8 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World METHOD method_31595 addBlockBreakParticles (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state + METHOD method_31596 (Ljava/util/function/Predicate;Ljava/util/List;Lnet/minecraft/class_5575;Lnet/minecraft/class_1297;)V + ARG 3 entity METHOD method_32886 emitGameEvent (Lnet/minecraft/class_1297;Lnet/minecraft/class_5712;Lnet/minecraft/class_2338;I)V ARG 1 entity ARG 2 gameEvent @@ -192,6 +194,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 8 category ARG 9 volume ARG 10 pitch + ARG 11 useDistance METHOD method_8488 getReceivedStrongRedstonePower (Lnet/minecraft/class_2338;)I ARG 1 pos METHOD method_8492 updateNeighbor (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;Lnet/minecraft/class_2338;)V diff --git a/mappings/net/minecraft/world/biome/Biome.mapping b/mappings/net/minecraft/world/biome/Biome.mapping index 716da8237e..3f095bf40b 100644 --- a/mappings/net/minecraft/world/biome/Biome.mapping +++ b/mappings/net/minecraft/world/biome/Biome.mapping @@ -35,6 +35,8 @@ CLASS net/minecraft/class_1959 net/minecraft/world/biome/Biome METHOD method_30774 getDefaultFoliageColor ()I METHOD method_30966 getSpawnSettings ()Lnet/minecraft/class_5483; METHOD method_30970 getGenerationSettings ()Lnet/minecraft/class_5485; + METHOD method_33599 isCold (Lnet/minecraft/class_2338;)Z + ARG 1 pos METHOD method_8685 canSetIce (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Z)Z ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/world/biome/DefaultBiomeCreator.mapping b/mappings/net/minecraft/world/biome/DefaultBiomeCreator.mapping index 3dc44d966f..6048a61c05 100644 --- a/mappings/net/minecraft/world/biome/DefaultBiomeCreator.mapping +++ b/mappings/net/minecraft/world/biome/DefaultBiomeCreator.mapping @@ -16,6 +16,7 @@ CLASS net/minecraft/class_5478 net/minecraft/world/biome/DefaultBiomeCreator ARG 1 scale ARG 2 temperature ARG 3 waterColor + ARG 4 frozen METHOD method_30687 createGiantTreeTaiga (FFFZ)Lnet/minecraft/class_1959; ARG 0 depth ARG 1 scale @@ -42,6 +43,7 @@ CLASS net/minecraft/class_5478 net/minecraft/world/biome/DefaultBiomeCreator ARG 1 scale ARG 2 tallTrees METHOD method_30692 createOcean (Lnet/minecraft/class_5483$class_5496;IIZLnet/minecraft/class_5485$class_5495;)Lnet/minecraft/class_1959; + ARG 0 spawnSettings ARG 1 waterColor ARG 2 waterFogColor ARG 3 deep @@ -52,26 +54,44 @@ CLASS net/minecraft/class_5478 net/minecraft/world/biome/DefaultBiomeCreator ARG 0 depth ARG 1 scale ARG 2 temperature + ARG 3 mountain + ARG 4 shattered METHOD method_30695 createJungleFeatures (FFFZZZLnet/minecraft/class_5483$class_5496;)Lnet/minecraft/class_1959; ARG 0 depth ARG 1 scale ARG 2 downfall + ARG 3 bamboo + ARG 4 edge + ARG 5 modified METHOD method_30696 createNormalBadlands (FFZ)Lnet/minecraft/class_1959; ARG 0 depth ARG 1 scale + ARG 2 plateau METHOD method_30697 createSnowyTundra (FFZZ)Lnet/minecraft/class_1959; ARG 0 depth ARG 1 scale + ARG 2 iceSpikes + ARG 3 mountains METHOD method_30698 createDesert (FFZZZ)Lnet/minecraft/class_1959; ARG 0 depth ARG 1 scale + ARG 2 villages + ARG 3 pyramids + ARG 4 fossils METHOD method_30699 createTaiga (FFZZZZ)Lnet/minecraft/class_1959; ARG 0 depth ARG 1 scale + ARG 2 snowy + ARG 3 mountains + ARG 4 villages + ARG 5 igloos METHOD method_30700 createBadlands (Lnet/minecraft/class_3504;FFZZ)Lnet/minecraft/class_1959; ARG 1 depth ARG 2 scale + ARG 3 plateau + ARG 4 wooded METHOD method_30701 createPlains (Z)Lnet/minecraft/class_1959; + ARG 0 sunflower METHOD method_30702 createColdOcean (Z)Lnet/minecraft/class_1959; ARG 0 deep METHOD method_30703 createJungleEdge ()Lnet/minecraft/class_1959; @@ -81,18 +101,22 @@ CLASS net/minecraft/class_5478 net/minecraft/world/biome/DefaultBiomeCreator METHOD method_30705 createDarkForest (FFZ)Lnet/minecraft/class_1959; ARG 0 depth ARG 1 scale + ARG 2 hills METHOD method_30706 createNormalOcean (Z)Lnet/minecraft/class_1959; ARG 0 deep METHOD method_30707 createModifiedJungleEdge ()Lnet/minecraft/class_1959; METHOD method_30708 createSwamp (FFZ)Lnet/minecraft/class_1959; ARG 0 depth ARG 1 scale + ARG 2 hills METHOD method_30709 createLukewarmOcean (Z)Lnet/minecraft/class_1959; ARG 0 deep METHOD method_30710 createModifiedJungle ()Lnet/minecraft/class_1959; METHOD method_30711 createForest (FFZLnet/minecraft/class_5483$class_5496;)Lnet/minecraft/class_1959; ARG 0 depth ARG 1 scale + ARG 2 flower + ARG 3 spawnSettings METHOD method_30712 createFrozenOcean (Z)Lnet/minecraft/class_1959; ARG 0 monument METHOD method_30713 createJungleHills ()Lnet/minecraft/class_1959; @@ -117,11 +141,18 @@ CLASS net/minecraft/class_5478 net/minecraft/world/biome/DefaultBiomeCreator METHOD method_30932 getSkyColor (F)I ARG 0 temperature METHOD method_31065 composeEndSpawnSettings (Lnet/minecraft/class_5485$class_5495;)Lnet/minecraft/class_1959; + ARG 0 builder METHOD method_31066 createOceanGenerationSettings (Lnet/minecraft/class_3504;ZZZ)Lnet/minecraft/class_5485$class_5495; + ARG 1 deep + ARG 2 warm METHOD method_31067 composeSavannaGenerationSettings (FFFZZLnet/minecraft/class_5483$class_5496;)Lnet/minecraft/class_1959; ARG 0 depth ARG 1 scale ARG 2 temperature + ARG 3 plateau + ARG 4 shattered + ARG 5 spawnSettings METHOD method_31068 createSavannaSpawnSettings ()Lnet/minecraft/class_5483$class_5496; METHOD method_31069 createForestSpawnSettings ()Lnet/minecraft/class_5483$class_5496; METHOD method_33132 createDripstoneCaves ()Lnet/minecraft/class_1959; + METHOD method_34674 createLushCaves ()Lnet/minecraft/class_1959; diff --git a/mappings/net/minecraft/world/biome/source/BiomeAccess.mapping b/mappings/net/minecraft/world/biome/source/BiomeAccess.mapping index 42125adedb..e26b6c333a 100644 --- a/mappings/net/minecraft/world/biome/source/BiomeAccess.mapping +++ b/mappings/net/minecraft/world/biome/source/BiomeAccess.mapping @@ -23,8 +23,12 @@ CLASS net/minecraft/class_4543 net/minecraft/world/biome/source/BiomeAccess ARG 1 pos METHOD method_27984 hashSeed (J)J ARG 0 seed + METHOD method_31608 getBiomeForNoiseGen (Lnet/minecraft/class_1923;)Lnet/minecraft/class_1959; + ARG 1 chunkPos CLASS class_4544 Storage METHOD method_16359 getBiomeForNoiseGen (III)Lnet/minecraft/class_1959; ARG 1 biomeX ARG 2 biomeY ARG 3 biomeZ + METHOD method_31609 getBiomeForNoiseGen (Lnet/minecraft/class_1923;)Lnet/minecraft/class_1959; + ARG 1 chunkPos diff --git a/mappings/net/minecraft/world/biome/source/BiomeArray.mapping b/mappings/net/minecraft/world/biome/source/BiomeArray.mapping index 90000645f7..6ddcdac2c9 100644 --- a/mappings/net/minecraft/world/biome/source/BiomeArray.mapping +++ b/mappings/net/minecraft/world/biome/source/BiomeArray.mapping @@ -4,4 +4,19 @@ CLASS net/minecraft/class_4548 net/minecraft/world/biome/source/BiomeArray FIELD field_20652 HORIZONTAL_SECTION_COUNT I FIELD field_20654 data [Lnet/minecraft/class_1959; FIELD field_21813 LOGGER Lorg/apache/logging/log4j/Logger; + METHOD (Lnet/minecraft/class_2359;Lnet/minecraft/class_5539;Lnet/minecraft/class_1923;Lnet/minecraft/class_1966;)V + ARG 2 world + ARG 3 chunkPos + ARG 4 biomeSource + METHOD (Lnet/minecraft/class_2359;Lnet/minecraft/class_5539;Lnet/minecraft/class_1923;Lnet/minecraft/class_1966;[I)V + ARG 2 world + ARG 3 chunkPos + ARG 4 biomeSource + ARG 5 ids + METHOD (Lnet/minecraft/class_2359;Lnet/minecraft/class_5539;[I)V + ARG 2 world + ARG 3 ids + METHOD (Lnet/minecraft/class_2359;Lnet/minecraft/class_5539;[Lnet/minecraft/class_1959;)V + ARG 2 world + ARG 3 data METHOD method_22401 toIntArray ()[I diff --git a/mappings/net/minecraft/world/biome/source/BiomeSource.mapping b/mappings/net/minecraft/world/biome/source/BiomeSource.mapping index 2b4f8afa76..8387b6c7cd 100644 --- a/mappings/net/minecraft/world/biome/source/BiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/BiomeSource.mapping @@ -5,11 +5,14 @@ CLASS net/minecraft/class_1966 net/minecraft/world/biome/source/BiomeSource FIELD field_9392 structureFeatures Ljava/util/Map; METHOD (Ljava/util/List;)V ARG 1 biomes + METHOD method_22394 (Lnet/minecraft/class_3195;Lnet/minecraft/class_1959;)Z + ARG 1 biome METHOD method_24385 locateBiome (IIIIILjava/util/function/Predicate;Ljava/util/Random;Z)Lnet/minecraft/class_2338; ARG 1 x ARG 2 y ARG 3 z ARG 4 radius + ARG 6 predicate ARG 7 random METHOD method_27985 withSeed (J)Lnet/minecraft/class_1966; ARG 1 seed @@ -23,6 +26,7 @@ CLASS net/minecraft/class_1966 net/minecraft/world/biome/source/BiomeSource ARG 2 y ARG 3 z ARG 4 radius + ARG 5 predicate ARG 6 random METHOD method_8763 getBiomesInArea (IIII)Ljava/util/Set; ARG 1 x diff --git a/mappings/net/minecraft/world/border/WorldBorder.mapping b/mappings/net/minecraft/world/border/WorldBorder.mapping index dbfeb5274a..2c55f316a4 100644 --- a/mappings/net/minecraft/world/border/WorldBorder.mapping +++ b/mappings/net/minecraft/world/border/WorldBorder.mapping @@ -155,6 +155,7 @@ CLASS net/minecraft/class_2784 net/minecraft/world/border/WorldBorder METHOD method_27357 writeNbt (Lnet/minecraft/class_2487;)V ARG 1 tag METHOD method_27358 fromDynamic (Lcom/mojang/serialization/DynamicLike;Lnet/minecraft/class_2784$class_5200;)Lnet/minecraft/class_2784$class_5200; + ARG 1 properties METHOD method_27359 getCenterZ ()D METHOD method_27360 getDamagePerBlock ()D METHOD method_27361 getSafeZone ()D diff --git a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping index 829c1b6f82..961ef241c0 100644 --- a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping @@ -25,6 +25,7 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 0 status 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;)Ljava/util/concurrent/CompletableFuture; + ARG 2 world METHOD method_12155 getMaxDistanceFromFull ()I METHOD method_12160 getHeightmapTypes ()Ljava/util/EnumSet; METHOD method_12161 byDistanceFromFull (I)Lnet/minecraft/class_2806; @@ -46,6 +47,7 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 5 task METHOD method_16556 (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;)Ljava/util/concurrent/CompletableFuture; ARG 0 targetStatus + ARG 2 world 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 @@ -138,16 +140,19 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 2 structureManager ARG 3 lightingProvider ARG 5 chunk + METHOD method_33732 (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;)Ljava/util/concurrent/CompletableFuture; + ARG 2 world CLASS class_2807 GenerationTask COMMENT A task called when a chunk needs to be generated. 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;)Ljava/util/concurrent/CompletableFuture; ARG 1 targetStatus COMMENT the status the chunk will be set to after the task is completed + ARG 3 world CLASS class_2808 ChunkType COMMENT Specifies the type of a chunk - FIELD field_12807 Lnet/minecraft/class_2806$class_2808; + FIELD field_12807 LEVELCHUNK 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; + FIELD field_12808 PROTOCHUNK 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 diff --git a/mappings/net/minecraft/world/chunk/WorldChunk.mapping b/mappings/net/minecraft/world/chunk/WorldChunk.mapping index 3182073107..9c2b8d1659 100644 --- a/mappings/net/minecraft/world/chunk/WorldChunk.mapping +++ b/mappings/net/minecraft/world/chunk/WorldChunk.mapping @@ -51,6 +51,8 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk ARG 1 levelTypeProvider METHOD method_12208 createBlockEntity (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2586; ARG 1 pos + METHOD method_12209 (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2248; + ARG 1 pos METHOD method_12212 (Lnet/minecraft/class_3195;)Lit/unimi/dsi/fastutil/longs/LongSet; ARG 0 structure METHOD method_12214 getBlockEntities ()Ljava/util/Map; @@ -68,6 +70,8 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk METHOD method_12225 getLevelType ()Lnet/minecraft/class_3193$class_3194; METHOD method_12226 setLoadedToWorld (Z)V ARG 1 loaded + METHOD method_12230 (Lnet/minecraft/class_2338;)Lnet/minecraft/class_3611; + ARG 1 pos METHOD method_12231 (Lnet/minecraft/class_2902$class_2903;)Lnet/minecraft/class_2902; ARG 1 type METHOD method_12234 getFluidState (III)Lnet/minecraft/class_3610; @@ -78,11 +82,13 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk ARG 1 world METHOD method_20530 disableTickSchedulers ()V METHOD method_31712 removeAllBlockEntities ()V - METHOD method_31713 updateAllBlockEntityTickers ()V + METHOD method_31713 updateAllBlockEntities ()V METHOD method_31715 canTickBlockEntities ()Z METHOD method_31718 wrapTicker (Lnet/minecraft/class_2586;Lnet/minecraft/class_5558;)Lnet/minecraft/class_5562; ARG 1 blockEntity ARG 2 blockEntityTicker + METHOD method_31719 (Lnet/minecraft/class_2586;Lnet/minecraft/class_5558;Lnet/minecraft/class_2338;Lnet/minecraft/class_2818$class_5564;)Lnet/minecraft/class_2818$class_5564; + ARG 3 pos METHOD method_31721 canTickBlockEntity (Lnet/minecraft/class_2818;Lnet/minecraft/class_2338;)Z METHOD method_31722 removeBlockEntity (Lnet/minecraft/class_2586;)V ARG 1 blockEntity @@ -93,6 +99,10 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk METHOD method_31725 removeBlockEntityTicker (Lnet/minecraft/class_2338;)V METHOD method_32917 (I)Lnet/minecraft/class_5713; ARG 1 sectionCoord + METHOD method_32919 updateGameEventListener (Lnet/minecraft/class_2586;)V + ARG 1 blockEntity + METHOD method_32920 (Lnet/minecraft/class_2586;)V + ARG 1 blockEntity CLASS 1 EmptyBlockEntityTickInvoker CLASS class_2819 CreationType CLASS class_5563 DirectBlockEntityTickInvoker diff --git a/mappings/net/minecraft/world/explosion/Explosion.mapping b/mappings/net/minecraft/world/explosion/Explosion.mapping index e4759d04b3..32f78893aa 100644 --- a/mappings/net/minecraft/world/explosion/Explosion.mapping +++ b/mappings/net/minecraft/world/explosion/Explosion.mapping @@ -54,6 +54,12 @@ CLASS net/minecraft/class_1927 net/minecraft/world/explosion/Explosion METHOD method_17752 getExposure (Lnet/minecraft/class_243;Lnet/minecraft/class_1297;)F ARG 0 source ARG 1 entity + METHOD method_24023 tryMergeStack (Lit/unimi/dsi/fastutil/objects/ObjectArrayList;Lnet/minecraft/class_1799;Lnet/minecraft/class_2338;)V + ARG 0 stacks + ARG 1 stack + ARG 2 pos + METHOD method_24024 (Lit/unimi/dsi/fastutil/objects/ObjectArrayList;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V + ARG 2 stack METHOD method_29553 chooseBehavior (Lnet/minecraft/class_1297;)Lnet/minecraft/class_5362; ARG 1 entity METHOD method_8346 getAffectedBlocks ()Ljava/util/List; diff --git a/mappings/net/minecraft/world/gen/YOffset.mapping b/mappings/net/minecraft/world/gen/YOffset.mapping index e6e38f0733..16cbe53266 100644 --- a/mappings/net/minecraft/world/gen/YOffset.mapping +++ b/mappings/net/minecraft/world/gen/YOffset.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_5843 net/minecraft/world/gen/YOffset METHOD method_33843 fromEither (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_5843; ARG 0 either METHOD method_33844 getY (Lnet/minecraft/class_5868;)I + ARG 1 context METHOD method_33845 getTop ()Lnet/minecraft/class_5843; METHOD method_33846 aboveBottom (I)Lnet/minecraft/class_5843; ARG 0 offset diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping index 1ddcc001b5..f44e8f3930 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping @@ -30,6 +30,7 @@ CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSetti ARG 8 mobGenerationDisabled ARG 9 aquifers ARG 10 noiseCaves + ARG 11 deepslate METHOD method_16400 getBedrockCeilingY ()I COMMENT Returns the Y level of the bedrock ceiling. COMMENT diff --git a/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping b/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping index b827443619..02189f8299 100644 --- a/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping @@ -97,7 +97,7 @@ CLASS net/minecraft/class_3864 net/minecraft/world/gen/feature/DefaultBiomeFeatu ARG 0 builder METHOD method_17010 addDefaultDisks (Lnet/minecraft/class_5485$class_5495;)V ARG 0 builder - METHOD method_17011 addClay (Lnet/minecraft/class_5485$class_5495;)V + METHOD method_17011 addClayDisk (Lnet/minecraft/class_5485$class_5495;)V ARG 0 builder METHOD method_17012 addMossyRocks (Lnet/minecraft/class_5485$class_5495;)V ARG 0 builder @@ -171,3 +171,7 @@ CLASS net/minecraft/class_3864 net/minecraft/world/gen/feature/DefaultBiomeFeatu ARG 0 builder METHOD method_33131 addDripstone (Lnet/minecraft/class_5485$class_5495;)V ARG 0 builder + METHOD method_34663 addLushCavesDecoration (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder + METHOD method_34664 addClayOre (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder