From d3ce4a951148cb36269a83a6cecf3ff4518eb08d Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Tue, 23 Nov 2021 02:30:43 +1100 Subject: [PATCH] Mapping Bonanza Part 11: World stuff (#2855) * World stuff * Update mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping Co-authored-by: apple502j <33279053+apple502j@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> * Update PalettedContainer.mapping Co-authored-by: apple502j <33279053+apple502j@users.noreply.github.com> Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> --- .../world/BlockCollisionSpliterator.mapping | 4 ++ .../minecraft/world/ChunkSerializer.mapping | 9 ++++ .../minecraft/world/FeatureUpdater.mapping | 4 ++ .../net/minecraft/world/Heightmap.mapping | 6 +++ .../net/minecraft/world/IdCountsState.mapping | 1 + .../minecraft/world/MobSpawnerLogic.mapping | 3 ++ .../minecraft/world/PersistentState.mapping | 1 + .../world/PersistentStateManager.mapping | 10 +++++ .../net/minecraft/world/PortalForcer.mapping | 18 ++++++++ .../minecraft/world/SaveProperties.mapping | 1 + .../world/biome/GenerationSettings.mapping | 5 +++ .../world/biome/OverworldBiomeCreator.mapping | 44 +++++++++++++++++-- .../world/biome/source/BiomeAccess.mapping | 1 + .../world/biome/source/BiomeSource.mapping | 4 ++ .../source/MultiNoiseBiomeSource.mapping | 7 +++ .../biome/source/util/MultiNoiseUtil.mapping | 1 + .../util/VanillaTerrainParameters.mapping | 2 + .../world/chunk/BiMapPalette.mapping | 1 + .../net/minecraft/world/chunk/Chunk.mapping | 3 +- .../world/chunk/ChunkSection.mapping | 3 +- .../minecraft/world/chunk/ChunkStatus.mapping | 21 +++++++++ .../world/chunk/PalettedContainer.mapping | 4 ++ .../world/chunk/light/LightingView.mapping | 2 + .../world/dimension/DimensionType.mapping | 7 +++ .../entity/EntityTrackingSection.mapping | 4 ++ .../world/entity/SectionedEntityCache.mapping | 4 ++ .../explosion/EntityExplosionBehavior.mapping | 2 + .../minecraft/world/level/LevelInfo.mapping | 1 + .../world/level/storage/LevelStorage.mapping | 16 +++++++ .../world/poi/PointOfInterestSet.mapping | 1 + .../world/poi/PointOfInterestStorage.mapping | 28 ++++++++++++ .../world/poi/PointOfInterestType.mapping | 2 + .../storage/EntityChunkDataAccess.mapping | 1 + .../world/storage/RegionFile.mapping | 4 ++ .../SerializingRegionBasedStorage.mapping | 8 ++++ .../storage/VersionedChunkStorage.mapping | 7 +++ .../world/timer/FunctionTimerCallback.mapping | 2 + .../net/minecraft/world/timer/Timer.mapping | 7 +++ 38 files changed, 244 insertions(+), 5 deletions(-) diff --git a/mappings/net/minecraft/world/BlockCollisionSpliterator.mapping b/mappings/net/minecraft/world/BlockCollisionSpliterator.mapping index b877eec2f0..3473e12f86 100644 --- a/mappings/net/minecraft/world/BlockCollisionSpliterator.mapping +++ b/mappings/net/minecraft/world/BlockCollisionSpliterator.mapping @@ -5,6 +5,9 @@ CLASS net/minecraft/class_5329 net/minecraft/world/BlockCollisionSpliterator FIELD field_25172 pos Lnet/minecraft/class_2338$class_2339; FIELD field_25173 boxShape Lnet/minecraft/class_265; FIELD field_25174 world Lnet/minecraft/class_1941; + FIELD field_35108 chunk Lnet/minecraft/class_1922; + FIELD field_35109 chunkPos J + FIELD field_35590 forEntity Z METHOD (Lnet/minecraft/class_1941;Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)V ARG 1 world ARG 2 entity @@ -13,6 +16,7 @@ CLASS net/minecraft/class_5329 net/minecraft/world/BlockCollisionSpliterator ARG 1 world ARG 2 entity ARG 3 box + ARG 4 forEntity METHOD method_29283 getChunk (II)Lnet/minecraft/class_1922; ARG 1 x ARG 2 z diff --git a/mappings/net/minecraft/world/ChunkSerializer.mapping b/mappings/net/minecraft/world/ChunkSerializer.mapping index 951981a766..a2029d1bc8 100644 --- a/mappings/net/minecraft/world/ChunkSerializer.mapping +++ b/mappings/net/minecraft/world/ChunkSerializer.mapping @@ -18,6 +18,7 @@ CLASS net/minecraft/class_2852 net/minecraft/world/ChunkSerializer ARG 0 pos ARG 1 nbt METHOD method_12392 readStructureStarts (Lnet/minecraft/class_6625;Lnet/minecraft/class_2487;J)Ljava/util/Map; + ARG 0 context ARG 1 nbt ARG 2 worldSeed METHOD method_12393 toNbt ([Lit/unimi/dsi/fastutil/shorts/ShortList;)Lnet/minecraft/class_2499; @@ -50,6 +51,14 @@ CLASS net/minecraft/class_2852 net/minecraft/world/ChunkSerializer ARG 0 block METHOD method_39313 (Lnet/minecraft/class_3611;)Ljava/lang/String; ARG 0 fluid + METHOD method_39314 (Ljava/lang/String;)Ljava/util/Optional; + ARG 0 id + METHOD method_39316 (Ljava/lang/String;)Ljava/util/Optional; + ARG 0 id + METHOD method_39317 (Ljava/lang/String;)Ljava/util/Optional; + ARG 0 id + METHOD method_39318 (Ljava/lang/String;)Ljava/util/Optional; + ARG 0 id METHOD method_39796 getList (Lnet/minecraft/class_2487;Ljava/lang/String;)Lnet/minecraft/class_2499; ARG 0 nbt ARG 1 key diff --git a/mappings/net/minecraft/world/FeatureUpdater.mapping b/mappings/net/minecraft/world/FeatureUpdater.mapping index 1ea9760f5e..8e79e8e7f9 100644 --- a/mappings/net/minecraft/world/FeatureUpdater.mapping +++ b/mappings/net/minecraft/world/FeatureUpdater.mapping @@ -4,7 +4,10 @@ CLASS net/minecraft/class_3360 net/minecraft/world/FeatureUpdater FIELD field_14434 needsUpdate Z FIELD field_14435 OLD_TO_NEW Ljava/util/Map; FIELD field_14436 ANCIENT_TO_OLD Ljava/util/Map; + METHOD (Lnet/minecraft/class_26;Ljava/util/List;Ljava/util/List;)V + ARG 1 persistentStateManager METHOD method_14734 init (Lnet/minecraft/class_26;)V + ARG 1 persistentStateManager METHOD method_14735 getUpdatedReferences (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 1 nbt METHOD method_14737 needsUpdate (II)Z @@ -20,3 +23,4 @@ CLASS net/minecraft/class_3360 net/minecraft/world/FeatureUpdater METHOD method_14744 markResolved (J)V METHOD method_14745 create (Lnet/minecraft/class_5321;Lnet/minecraft/class_26;)Lnet/minecraft/class_3360; ARG 0 world + ARG 1 persistentStateManager diff --git a/mappings/net/minecraft/world/Heightmap.mapping b/mappings/net/minecraft/world/Heightmap.mapping index a83606b5b3..5033d397cf 100644 --- a/mappings/net/minecraft/world/Heightmap.mapping +++ b/mappings/net/minecraft/world/Heightmap.mapping @@ -18,6 +18,8 @@ CLASS net/minecraft/class_2902 net/minecraft/world/Heightmap ARG 4 state METHOD method_12598 asLongArray ()[J METHOD method_12600 setTo (Lnet/minecraft/class_2791;Lnet/minecraft/class_2902$class_2903;[J)V + ARG 1 chunk + ARG 2 type METHOD method_12601 get (I)I ARG 1 index METHOD method_12602 set (III)V @@ -49,5 +51,9 @@ CLASS net/minecraft/class_2902 net/minecraft/world/Heightmap ARG 0 name METHOD method_16137 shouldSendToClient ()Z METHOD method_16402 getBlockPredicate ()Ljava/util/function/Predicate; + METHOD method_16685 (Lnet/minecraft/class_2680;)Z + ARG 0 state + METHOD method_16686 (Lnet/minecraft/class_2680;)Z + ARG 0 state METHOD method_20454 isStoredServerSide ()Z CLASS class_2904 Purpose diff --git a/mappings/net/minecraft/world/IdCountsState.mapping b/mappings/net/minecraft/world/IdCountsState.mapping index 6840b041dd..a85691a6f4 100644 --- a/mappings/net/minecraft/world/IdCountsState.mapping +++ b/mappings/net/minecraft/world/IdCountsState.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_3978 net/minecraft/world/IdCountsState FIELD field_17662 idCounts Lit/unimi/dsi/fastutil/objects/Object2IntMap; + FIELD field_31830 IDCOUNTS_KEY Ljava/lang/String; METHOD method_17920 getNextMapId ()I METHOD method_32360 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_3978; ARG 0 nbt diff --git a/mappings/net/minecraft/world/MobSpawnerLogic.mapping b/mappings/net/minecraft/world/MobSpawnerLogic.mapping index 9112ff9066..230c99f7be 100644 --- a/mappings/net/minecraft/world/MobSpawnerLogic.mapping +++ b/mappings/net/minecraft/world/MobSpawnerLogic.mapping @@ -11,6 +11,8 @@ CLASS net/minecraft/class_1917 net/minecraft/world/MobSpawnerLogic FIELD field_9157 spawnRange I FIELD field_9158 requiredPlayerRange I FIELD field_9160 maxNearbyEntities I + METHOD method_18085 (DDDLnet/minecraft/class_1297;)Lnet/minecraft/class_1297; + ARG 6 entity METHOD method_31588 serverTick (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 pos @@ -18,6 +20,7 @@ CLASS net/minecraft/class_1917 net/minecraft/world/MobSpawnerLogic ARG 1 world ARG 2 pos METHOD method_8272 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; + ARG 1 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/PersistentState.mapping b/mappings/net/minecraft/world/PersistentState.mapping index 6ad5802434..488c74ea99 100644 --- a/mappings/net/minecraft/world/PersistentState.mapping +++ b/mappings/net/minecraft/world/PersistentState.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_18 net/minecraft/world/PersistentState FIELD field_17661 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_72 dirty Z METHOD method_17919 save (Ljava/io/File;)V + ARG 1 file METHOD method_75 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 1 nbt METHOD method_78 setDirty (Z)V diff --git a/mappings/net/minecraft/world/PersistentStateManager.mapping b/mappings/net/minecraft/world/PersistentStateManager.mapping index 3e432c24f4..cafb796408 100644 --- a/mappings/net/minecraft/world/PersistentStateManager.mapping +++ b/mappings/net/minecraft/world/PersistentStateManager.mapping @@ -7,8 +7,11 @@ CLASS net/minecraft/class_26 net/minecraft/world/PersistentStateManager ARG 1 directory ARG 2 dataFixer METHOD method_120 readFromFile (Ljava/util/function/Function;Ljava/lang/String;)Lnet/minecraft/class_18; + ARG 1 readFunction ARG 2 id METHOD method_123 set (Ljava/lang/String;Lnet/minecraft/class_18;)V + ARG 1 id + ARG 2 state METHOD method_125 save ()V METHOD method_17921 isCompressed (Ljava/io/PushbackInputStream;)Z METHOD method_17922 getFile (Ljava/lang/String;)Ljava/io/File; @@ -17,5 +20,12 @@ CLASS net/minecraft/class_26 net/minecraft/world/PersistentStateManager ARG 1 id ARG 2 dataVersion METHOD method_17924 getOrCreate (Ljava/util/function/Function;Ljava/util/function/Supplier;Ljava/lang/String;)Lnet/minecraft/class_18; + ARG 1 readFunction + ARG 2 supplier + ARG 3 id METHOD method_20786 get (Ljava/util/function/Function;Ljava/lang/String;)Lnet/minecraft/class_18; + ARG 1 readFunction ARG 2 id + METHOD method_32384 (Ljava/lang/String;Lnet/minecraft/class_18;)V + ARG 1 id + ARG 2 state diff --git a/mappings/net/minecraft/world/PortalForcer.mapping b/mappings/net/minecraft/world/PortalForcer.mapping index 5c1a131ed4..f05a6502fd 100644 --- a/mappings/net/minecraft/world/PortalForcer.mapping +++ b/mappings/net/minecraft/world/PortalForcer.mapping @@ -2,11 +2,29 @@ CLASS net/minecraft/class_1946 net/minecraft/world/PortalForcer FIELD field_9286 world Lnet/minecraft/class_3218; METHOD (Lnet/minecraft/class_3218;)V ARG 1 world + METHOD method_22388 (Lnet/minecraft/class_4156;)I + ARG 0 poi + METHOD method_22389 (Lnet/minecraft/class_4158;)Z + ARG 0 poiType + METHOD method_22390 (Lnet/minecraft/class_2338;Lnet/minecraft/class_4156;)D + ARG 1 poi + METHOD method_30479 (Lnet/minecraft/class_4156;)Lnet/minecraft/class_5459$class_5460; + ARG 1 poi + METHOD method_30480 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)Z + ARG 2 pos METHOD method_30481 isValidPortalPos (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_2350;I)Z ARG 1 pos ARG 2 temp ARG 3 portalDirection ARG 4 distanceOrthogonalToPortal METHOD method_30482 createPortal (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350$class_2351;)Ljava/util/Optional; + ARG 1 pos + ARG 2 axis METHOD method_30483 getPortalRect (Lnet/minecraft/class_2338;ZLnet/minecraft/class_2784;)Ljava/util/Optional; + ARG 1 pos ARG 2 destIsNether + ARG 3 worldBorder + METHOD method_31119 (Lnet/minecraft/class_4156;)Z + ARG 1 poi + METHOD method_39663 (Lnet/minecraft/class_2784;Lnet/minecraft/class_4156;)Z + ARG 1 poi diff --git a/mappings/net/minecraft/world/SaveProperties.mapping b/mappings/net/minecraft/world/SaveProperties.mapping index 836413bc01..356691dcc4 100644 --- a/mappings/net/minecraft/world/SaveProperties.mapping +++ b/mappings/net/minecraft/world/SaveProperties.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_5219 net/minecraft/world/SaveProperties METHOD method_146 getGameRules ()Lnet/minecraft/class_1928; METHOD method_150 getLevelName ()Ljava/lang/String; METHOD method_151 populateCrashReport (Lnet/minecraft/class_129;)V + ARG 1 section METHOD method_152 isHardcore ()Z METHOD method_163 cloneWorldNbt (Lnet/minecraft/class_5455;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 1 registryManager diff --git a/mappings/net/minecraft/world/biome/GenerationSettings.mapping b/mappings/net/minecraft/world/biome/GenerationSettings.mapping index 4ef7449f55..27f65240fd 100644 --- a/mappings/net/minecraft/world/biome/GenerationSettings.mapping +++ b/mappings/net/minecraft/world/biome/GenerationSettings.mapping @@ -6,6 +6,9 @@ CLASS net/minecraft/class_5485 net/minecraft/world/biome/GenerationSettings FIELD field_26639 INSTANCE Lnet/minecraft/class_5485; FIELD field_26640 flowerFeatures Ljava/util/List; FIELD field_34465 allowedFeatures Ljava/util/Set; + METHOD (Ljava/util/Map;Ljava/util/List;)V + ARG 1 carvers + ARG 2 features METHOD method_30802 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_30976 getCarversForStep (Lnet/minecraft/class_2893$class_2894;)Ljava/util/List; @@ -15,6 +18,7 @@ CLASS net/minecraft/class_5485 net/minecraft/world/biome/GenerationSettings COMMENT Returns the lists of features configured for each {@link net.minecraft.world.gen.GenerationStep.Feature feature generation step}, up to the highest step that has a configured feature. COMMENT Entries are guaranteed to not be null, but may be empty lists if an earlier step has no features, but a later step does. METHOD method_38105 isFeatureAllowed (Lnet/minecraft/class_6796;)Z + ARG 1 feature CLASS class_5495 Builder FIELD field_26642 carvers Ljava/util/Map; FIELD field_26643 features Ljava/util/List; @@ -29,3 +33,4 @@ CLASS net/minecraft/class_5485 net/minecraft/world/biome/GenerationSettings ARG 2 carver METHOD method_30992 feature (Lnet/minecraft/class_2893$class_2895;Lnet/minecraft/class_6796;)Lnet/minecraft/class_5485$class_5495; ARG 1 featureStep + ARG 2 feature diff --git a/mappings/net/minecraft/world/biome/OverworldBiomeCreator.mapping b/mappings/net/minecraft/world/biome/OverworldBiomeCreator.mapping index 4b94860a31..d128481ec1 100644 --- a/mappings/net/minecraft/world/biome/OverworldBiomeCreator.mapping +++ b/mappings/net/minecraft/world/biome/OverworldBiomeCreator.mapping @@ -1,30 +1,48 @@ CLASS net/minecraft/class_5478 net/minecraft/world/biome/OverworldBiomeCreator + FIELD field_35340 DEFAULT_WATER_COLOR I + FIELD field_35341 DEFAULT_WATER_FOG_COLOR I + FIELD field_35342 DEFAULT_FOG_COLOR I + FIELD field_35436 DEFAULT_MUSIC Lnet/minecraft/class_5195; METHOD method_30683 createJungle ()Lnet/minecraft/class_1959; METHOD method_30684 createMushroomFields ()Lnet/minecraft/class_1959; METHOD method_30685 createBeach (ZZ)Lnet/minecraft/class_1959; + ARG 0 snowy + ARG 1 stony METHOD method_30686 createRiver (Z)Lnet/minecraft/class_1959; - METHOD method_30687 createOldGrowthPineTaiga (Z)Lnet/minecraft/class_1959; + ARG 0 frozen + METHOD method_30687 createOldGrowthTaiga (Z)Lnet/minecraft/class_1959; + ARG 0 spruce METHOD method_30690 createWindsweptHills (Z)Lnet/minecraft/class_1959; + ARG 0 forest METHOD method_30692 createOcean (Lnet/minecraft/class_5483$class_5496;IILnet/minecraft/class_5485$class_5495;)Lnet/minecraft/class_1959; ARG 0 spawnSettings ARG 1 waterColor ARG 2 waterFogColor METHOD method_30694 createSavanna (ZZ)Lnet/minecraft/class_1959; - ARG 1 windswept + ARG 0 windswept + ARG 1 plateau METHOD method_30695 createJungleFeatures (FZZZLnet/minecraft/class_5483$class_5496;)Lnet/minecraft/class_1959; ARG 0 depth ARG 1 bamboo ARG 2 sparse ARG 3 unmodified - METHOD method_30696 createNormalBadlands (Z)Lnet/minecraft/class_1959; + ARG 4 spawnSettings + METHOD method_30696 createBadlands (Z)Lnet/minecraft/class_1959; + ARG 0 plateau METHOD method_30698 createDesert ()Lnet/minecraft/class_1959; METHOD method_30699 createTaiga (Z)Lnet/minecraft/class_1959; ARG 0 cold METHOD method_30701 createPlains (ZZZ)Lnet/minecraft/class_1959; + ARG 0 sunflower + ARG 1 snowy + ARG 2 iceSpikes METHOD method_30702 createColdOcean (Z)Lnet/minecraft/class_1959; ARG 0 deep METHOD method_30703 createSparseJungle ()Lnet/minecraft/class_1959; METHOD method_30704 createNormalForest (ZZZ)Lnet/minecraft/class_1959; + ARG 0 birch + ARG 1 oldGrowth + ARG 2 flower METHOD method_30705 createDarkForest ()Lnet/minecraft/class_1959; METHOD method_30706 createNormalOcean (Z)Lnet/minecraft/class_1959; ARG 0 deep @@ -47,3 +65,23 @@ CLASS net/minecraft/class_5478 net/minecraft/world/biome/OverworldBiomeCreator METHOD method_38577 createStonyPeaks ()Lnet/minecraft/class_1959; METHOD method_38578 createSnowySlopes ()Lnet/minecraft/class_1959; METHOD method_38579 createGrove ()Lnet/minecraft/class_1959; + METHOD method_39151 createBiome (Lnet/minecraft/class_1959$class_1963;Lnet/minecraft/class_1959$class_1961;FFIILnet/minecraft/class_5483$class_5496;Lnet/minecraft/class_5485$class_5495;Lnet/minecraft/class_5195;)Lnet/minecraft/class_1959; + ARG 0 precipitation + ARG 1 category + ARG 2 temperature + ARG 3 downfall + ARG 4 waterColor + ARG 5 waterFogColor + ARG 6 spawnSettings + ARG 7 generationSettings + ARG 8 music + METHOD method_39152 createBiome (Lnet/minecraft/class_1959$class_1963;Lnet/minecraft/class_1959$class_1961;FFLnet/minecraft/class_5483$class_5496;Lnet/minecraft/class_5485$class_5495;Lnet/minecraft/class_5195;)Lnet/minecraft/class_1959; + ARG 0 precipitation + ARG 1 category + ARG 2 temperature + ARG 3 downfall + ARG 4 spawnSettings + ARG 5 generationSettings + ARG 6 music + METHOD method_39153 addBasicFeatures (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 generationSettings diff --git a/mappings/net/minecraft/world/biome/source/BiomeAccess.mapping b/mappings/net/minecraft/world/biome/source/BiomeAccess.mapping index 87cc3c84fe..f82e506898 100644 --- a/mappings/net/minecraft/world/biome/source/BiomeAccess.mapping +++ b/mappings/net/minecraft/world/biome/source/BiomeAccess.mapping @@ -20,6 +20,7 @@ CLASS net/minecraft/class_4543 net/minecraft/world/biome/source/BiomeAccess METHOD method_27984 hashSeed (J)J ARG 0 seed METHOD method_38107 withSource (Lnet/minecraft/class_4543$class_4544;)Lnet/minecraft/class_4543; + ARG 1 storage CLASS class_4544 Storage METHOD method_16359 getBiomeForNoiseGen (III)Lnet/minecraft/class_1959; ARG 1 biomeX diff --git a/mappings/net/minecraft/world/biome/source/BiomeSource.mapping b/mappings/net/minecraft/world/biome/source/BiomeSource.mapping index 0431dffbf6..ceebe785e1 100644 --- a/mappings/net/minecraft/world/biome/source/BiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/BiomeSource.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_1966 net/minecraft/world/biome/source/BiomeSource FIELD field_20643 biomes Ljava/util/Set; FIELD field_24713 CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/List;)V + ARG 1 biomes METHOD method_24385 locateBiome (IIIIILjava/util/function/Predicate;Ljava/util/Random;ZLnet/minecraft/class_6544$class_6552;)Lnet/minecraft/class_2338; ARG 1 x ARG 2 y @@ -17,6 +19,8 @@ CLASS net/minecraft/class_1966 net/minecraft/world/biome/source/BiomeSource ARG 1 info ARG 2 pos ARG 3 noiseSampler + METHOD method_39525 (Ljava/util/List;Z)Ljava/util/List; + ARG 1 biomes METHOD method_8762 locateBiome (IIIILjava/util/function/Predicate;Ljava/util/Random;Lnet/minecraft/class_6544$class_6552;)Lnet/minecraft/class_2338; ARG 1 x ARG 2 y diff --git a/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping b/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping index b42826a5e1..2b8f1fcf0f 100644 --- a/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping @@ -22,8 +22,15 @@ CLASS net/minecraft/class_4766 net/minecraft/world/biome/source/MultiNoiseBiomeS FIELD field_34499 OVERWORLD Lnet/minecraft/class_4766$class_5305; METHOD (Lnet/minecraft/class_2960;Ljava/util/function/Function;)V ARG 1 id + ARG 2 biomeSourceFunction METHOD method_28469 getBiomeSource (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4766; ARG 1 biomeRegistry + METHOD method_39531 getBiomeSource (Lnet/minecraft/class_4766$class_5502;Z)Lnet/minecraft/class_4766; + ARG 1 instance + ARG 2 useInstance + METHOD method_39532 getBiomeSource (Lnet/minecraft/class_2378;Z)Lnet/minecraft/class_4766; + ARG 1 biomeRegistry + ARG 2 useInstance CLASS class_5502 Instance FIELD comp_274 preset Lnet/minecraft/class_4766$class_5305; FIELD comp_275 biomeRegistry Lnet/minecraft/class_2378; diff --git a/mappings/net/minecraft/world/biome/source/util/MultiNoiseUtil.mapping b/mappings/net/minecraft/world/biome/source/util/MultiNoiseUtil.mapping index 4bfce9a183..0d7dfecdf1 100644 --- a/mappings/net/minecraft/world/biome/source/util/MultiNoiseUtil.mapping +++ b/mappings/net/minecraft/world/biome/source/util/MultiNoiseUtil.mapping @@ -153,6 +153,7 @@ CLASS net/minecraft/class_6544 net/minecraft/world/biome/source/util/MultiNoiseU FIELD field_34489 value Ljava/lang/Object; METHOD (Lnet/minecraft/class_6544$class_4762;Ljava/lang/Object;)V ARG 1 parameters + ARG 2 value CLASS class_6550 TreeNode FIELD field_34490 parameters [Lnet/minecraft/class_6544$class_6546; METHOD (Ljava/util/List;)V diff --git a/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping b/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping index 7d4f31421a..c0117ec2a4 100644 --- a/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping +++ b/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_6555 net/minecraft/world/biome/source/util/VanillaTerr FIELD field_34529 factorSpline Lnet/minecraft/class_6492; FIELD field_34530 peakSpline Lnet/minecraft/class_6492; FIELD field_34531 OFFSET_VALUE_OFFSET F + FIELD field_35456 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_6492;Lnet/minecraft/class_6492;Lnet/minecraft/class_6492;)V ARG 1 offsetSpline ARG 2 factorSpline @@ -49,6 +50,7 @@ CLASS net/minecraft/class_6555 net/minecraft/world/biome/source/util/VanillaTerr METHOD comp_237 normalizedWeirdness ()F METHOD comp_238 weirdnessNoise ()F CLASS class_6744 LocationFunction + FIELD field_35463 CODEC Lcom/mojang/serialization/Codec; FIELD field_35465 noiseFunction Lnet/minecraft/class_6501; FIELD field_35466 id Ljava/lang/String; METHOD (Ljava/lang/String;ILnet/minecraft/class_6501;Ljava/lang/String;)V diff --git a/mappings/net/minecraft/world/chunk/BiMapPalette.mapping b/mappings/net/minecraft/world/chunk/BiMapPalette.mapping index 873a3b9303..b998400965 100644 --- a/mappings/net/minecraft/world/chunk/BiMapPalette.mapping +++ b/mappings/net/minecraft/world/chunk/BiMapPalette.mapping @@ -17,4 +17,5 @@ CLASS net/minecraft/class_2814 net/minecraft/world/chunk/BiMapPalette ARG 0 bits ARG 1 idList ARG 2 listener + ARG 3 entries METHOD method_38288 getElements ()Ljava/util/List; diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index 1621e323bb..50697ddbbf 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -91,7 +91,8 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk ARG 0 world ARG 1 biome ARG 2 sectionArray - METHOD method_38257 (Lnet/minecraft/class_6780;Lnet/minecraft/class_6544$class_6552;)V + METHOD method_38257 populateBiomes (Lnet/minecraft/class_6780;Lnet/minecraft/class_6544$class_6552;)V + ARG 1 biomeSupplier ARG 2 sampler METHOD method_38259 getSection (I)Lnet/minecraft/class_2826; ARG 1 yIndex diff --git a/mappings/net/minecraft/world/chunk/ChunkSection.mapping b/mappings/net/minecraft/world/chunk/ChunkSection.mapping index 1685413c8b..f8ec654b4e 100644 --- a/mappings/net/minecraft/world/chunk/ChunkSection.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkSection.mapping @@ -51,7 +51,8 @@ CLASS net/minecraft/class_2826 net/minecraft/world/chunk/ChunkSection ARG 2 count METHOD method_31729 blockCoordFromChunkCoord (I)I ARG 0 chunkPos - METHOD method_38291 (Lnet/minecraft/class_6780;Lnet/minecraft/class_6544$class_6552;II)V + METHOD method_38291 populateBiomes (Lnet/minecraft/class_6780;Lnet/minecraft/class_6544$class_6552;II)V + ARG 1 biomeSupplier ARG 2 sampler ARG 3 x ARG 4 z diff --git a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping index 92544fe4c9..af3ccb33e2 100644 --- a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping @@ -65,6 +65,11 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 2 generator ARG 3 chunks ARG 4 chunk + METHOD method_16566 (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 3 lightingProvider + ARG 5 chunk METHOD method_16569 (Lnet/minecraft/class_2806;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Ljava/util/List;Lnet/minecraft/class_2791;)V ARG 0 targetStatus ARG 1 world @@ -139,6 +144,11 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 2 generator ARG 3 chunks ARG 4 chunk + METHOD method_38278 (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 3 lightingProvider + ARG 5 chunk METHOD method_38282 (Lnet/minecraft/class_2806;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Ljava/util/List;Lnet/minecraft/class_2791;)V ARG 0 targetStatus ARG 1 world @@ -173,6 +183,17 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 5 lightingProvider ARG 7 chunks ARG 8 chunk + METHOD method_39789 (Lnet/minecraft/class_2806;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Ljava/util/List;Lnet/minecraft/class_2791;)V + ARG 0 targetStatus + ARG 1 world + ARG 2 generator + ARG 3 chunks + ARG 4 chunk + METHOD method_39790 (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 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;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; diff --git a/mappings/net/minecraft/world/chunk/PalettedContainer.mapping b/mappings/net/minecraft/world/chunk/PalettedContainer.mapping index f1e7057240..0a844bc191 100644 --- a/mappings/net/minecraft/world/chunk/PalettedContainer.mapping +++ b/mappings/net/minecraft/world/chunk/PalettedContainer.mapping @@ -104,6 +104,8 @@ CLASS net/minecraft/class_2841 net/minecraft/world/chunk/PalettedContainer ARG 2 container METHOD method_38303 (Lnet/minecraft/class_2359;Lnet/minecraft/class_2841$class_6563;Lnet/minecraft/class_2841$class_6562;)Lcom/mojang/serialization/DataResult; ARG 2 serialized + METHOD method_39794 (Ljava/util/function/Consumer;Lnet/minecraft/class_2837;I)V + ARG 2 id CLASS class_4464 Counter COMMENT A counter that receives a palette entry and its number of occurences COMMENT in the container. @@ -147,6 +149,8 @@ CLASS net/minecraft/class_2841 net/minecraft/world/chunk/PalettedContainer METHOD method_38308 importFrom (Lnet/minecraft/class_2837;Lnet/minecraft/class_6490;)V COMMENT Imports the data from the other {@code storage} with the other COMMENT {@code palette}. + ARG 1 palette + ARG 2 storage METHOD method_38309 writePacket (Lnet/minecraft/class_2540;)V ARG 1 buf CLASS class_6562 Serialized diff --git a/mappings/net/minecraft/world/chunk/light/LightingView.mapping b/mappings/net/minecraft/world/chunk/light/LightingView.mapping index 2a1eb82f9b..95b4b1272e 100644 --- a/mappings/net/minecraft/world/chunk/light/LightingView.mapping +++ b/mappings/net/minecraft/world/chunk/light/LightingView.mapping @@ -8,6 +8,8 @@ CLASS net/minecraft/class_3565 net/minecraft/world/chunk/light/LightingView ARG 1 pos ARG 2 level METHOD method_15516 doLightUpdates (IZZ)I + ARG 2 doSkylight + ARG 3 skipEdgeLightPropagation METHOD method_15518 hasUpdates ()Z METHOD method_15551 setSectionStatus (Lnet/minecraft/class_4076;Z)V ARG 1 pos diff --git a/mappings/net/minecraft/world/dimension/DimensionType.mapping b/mappings/net/minecraft/world/dimension/DimensionType.mapping index 54ec50c4df..4f66685b91 100644 --- a/mappings/net/minecraft/world/dimension/DimensionType.mapping +++ b/mappings/net/minecraft/world/dimension/DimensionType.mapping @@ -72,6 +72,7 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType ARG 18 ambientLight METHOD method_12488 getSaveDirectory (Lnet/minecraft/class_5321;Ljava/nio/file/Path;)Ljava/nio/file/Path; ARG 0 worldRef + ARG 1 worldDirectory METHOD method_12489 getSuffix ()Ljava/lang/String; METHOD method_12491 hasSkyLight ()Z METHOD method_27998 hasCeiling ()Z @@ -81,11 +82,14 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType METHOD method_28516 getBrightness (I)F ARG 1 lightLevel METHOD method_28517 createDefaultDimensionOptions (Lnet/minecraft/class_5455;JZ)Lnet/minecraft/class_2370; + ARG 0 registryManager + ARG 1 seed METHOD method_28521 worldFromDimensionNbt (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/DataResult; ARG 0 nbt METHOD method_28522 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_28523 addRegistryDefaults (Lnet/minecraft/class_5455;)Lnet/minecraft/class_5455; + ARG 0 registryManager METHOD method_28528 getSkyAngle (J)F ARG 1 time METHOD method_28531 getMoonPhase (J)I @@ -135,3 +139,6 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType ARG 0 type METHOD method_32924 getHeight ()I METHOD method_32925 getLogicalHeight ()I + METHOD method_39540 createDefaultDimensionOptions (Lnet/minecraft/class_5455;J)Lnet/minecraft/class_2370; + ARG 0 registryManager + ARG 1 seed diff --git a/mappings/net/minecraft/world/entity/EntityTrackingSection.mapping b/mappings/net/minecraft/world/entity/EntityTrackingSection.mapping index 0e595f4b7a..c275814ff2 100644 --- a/mappings/net/minecraft/world/entity/EntityTrackingSection.mapping +++ b/mappings/net/minecraft/world/entity/EntityTrackingSection.mapping @@ -9,13 +9,17 @@ CLASS net/minecraft/class_5572 net/minecraft/world/entity/EntityTrackingSection METHOD method_31761 isEmpty ()Z METHOD method_31762 forEach (Lnet/minecraft/class_5575;Lnet/minecraft/class_238;Ljava/util/function/Consumer;)V ARG 1 type + ARG 2 box ARG 3 action METHOD method_31763 swapStatus (Lnet/minecraft/class_5584;)Lnet/minecraft/class_5584; ARG 1 status METHOD method_31764 add (Lnet/minecraft/class_5568;)V + ARG 1 entity METHOD method_31765 forEach (Lnet/minecraft/class_238;Ljava/util/function/Consumer;)V + ARG 1 box ARG 2 action METHOD method_31766 stream ()Ljava/util/stream/Stream; METHOD method_31767 remove (Lnet/minecraft/class_5568;)Z + ARG 1 entity METHOD method_31768 getStatus ()Lnet/minecraft/class_5584; METHOD method_31769 size ()I diff --git a/mappings/net/minecraft/world/entity/SectionedEntityCache.mapping b/mappings/net/minecraft/world/entity/SectionedEntityCache.mapping index e8dd1d3573..96b5ef95df 100644 --- a/mappings/net/minecraft/world/entity/SectionedEntityCache.mapping +++ b/mappings/net/minecraft/world/entity/SectionedEntityCache.mapping @@ -23,6 +23,8 @@ CLASS net/minecraft/class_5573 net/minecraft/world/entity/SectionedEntityCache COMMENT Runs the given action on each collection of entities in the chunk sections within the given box. ARG 1 box ARG 2 action + METHOD method_31778 (Lnet/minecraft/class_5575;Lnet/minecraft/class_238;Ljava/util/function/Consumer;Lnet/minecraft/class_5572;)V + ARG 3 section METHOD method_31780 (Lit/unimi/dsi/fastutil/longs/LongSet;J)V ARG 1 sectionPos METHOD method_31781 sectionCount ()I @@ -41,3 +43,5 @@ CLASS net/minecraft/class_5573 net/minecraft/world/entity/SectionedEntityCache ARG 0 sectionPos METHOD method_31788 addSection (J)Lnet/minecraft/class_5572; ARG 1 sectionPos + METHOD method_39465 (Lnet/minecraft/class_238;Ljava/util/function/Consumer;Lnet/minecraft/class_5572;)V + ARG 2 section diff --git a/mappings/net/minecraft/world/explosion/EntityExplosionBehavior.mapping b/mappings/net/minecraft/world/explosion/EntityExplosionBehavior.mapping index 6d1d5548b9..b76f563398 100644 --- a/mappings/net/minecraft/world/explosion/EntityExplosionBehavior.mapping +++ b/mappings/net/minecraft/world/explosion/EntityExplosionBehavior.mapping @@ -2,3 +2,5 @@ CLASS net/minecraft/class_5361 net/minecraft/world/explosion/EntityExplosionBeha FIELD field_25399 entity Lnet/minecraft/class_1297; METHOD (Lnet/minecraft/class_1297;)V ARG 1 entity + METHOD method_29552 (Lnet/minecraft/class_1927;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3610;Ljava/lang/Float;)Ljava/lang/Float; + ARG 6 max diff --git a/mappings/net/minecraft/world/level/LevelInfo.mapping b/mappings/net/minecraft/world/level/LevelInfo.mapping index 1d9502177d..ac45e6bd14 100644 --- a/mappings/net/minecraft/world/level/LevelInfo.mapping +++ b/mappings/net/minecraft/world/level/LevelInfo.mapping @@ -22,6 +22,7 @@ CLASS net/minecraft/class_1940 net/minecraft/world/level/LevelInfo METHOD method_28382 withGameMode (Lnet/minecraft/class_1934;)Lnet/minecraft/class_1940; ARG 1 mode METHOD method_28383 fromDynamic (Lcom/mojang/serialization/Dynamic;Lnet/minecraft/class_5359;)Lnet/minecraft/class_1940; + ARG 0 dynamic ARG 1 dataPackSettings METHOD method_28385 withCopiedGameRules ()Lnet/minecraft/class_1940; METHOD method_29557 withDataPackSettings (Lnet/minecraft/class_5359;)Lnet/minecraft/class_1940; diff --git a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping index 6e0e2f3e1b..d98f030c1e 100644 --- a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage ARG 2 backupsDirectory ARG 3 dataFixer METHOD method_17926 createLevelDataParser (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5359;)Ljava/util/function/BiFunction; + ARG 1 dataPackSettings METHOD method_17931 getCurrentVersion ()I METHOD method_19636 getSavesDirectory ()Ljava/nio/file/Path; METHOD method_230 levelExists (Ljava/lang/String;)Z @@ -20,6 +21,7 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage METHOD method_240 isLevelNameValid (Ljava/lang/String;)Z ARG 1 name METHOD method_26998 readLevelProperties (Ljava/io/File;Ljava/util/function/BiFunction;)Ljava/lang/Object; + ARG 1 file ARG 2 levelDataParser METHOD method_26999 create (Ljava/nio/file/Path;)Lnet/minecraft/class_32; ARG 0 path @@ -32,8 +34,16 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage METHOD method_29014 createLevelDataParser (Ljava/io/File;Z)Ljava/util/function/BiFunction; ARG 1 file ARG 2 locked + METHOD method_29015 (Ljava/io/File;ZLjava/io/File;Lcom/mojang/datafixers/DataFixer;)Lnet/minecraft/class_34; + ARG 3 file + ARG 4 dataFixer METHOD method_29580 parseDataPackSettings (Lcom/mojang/serialization/Dynamic;)Lnet/minecraft/class_5359; + METHOD method_29582 (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5359;Ljava/io/File;Lcom/mojang/datafixers/DataFixer;)Lnet/minecraft/class_31; + ARG 2 file + ARG 3 dataFixer METHOD method_29583 readDataPackSettings (Ljava/io/File;Lcom/mojang/datafixers/DataFixer;)Lnet/minecraft/class_5359; + ARG 0 file + ARG 1 dataFixer METHOD method_35504 getFormatName ()Ljava/lang/String; CLASS class_5143 Session FIELD field_23767 lock Lnet/minecraft/class_5125; @@ -48,6 +58,7 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage METHOD method_27010 getDirectory (Lnet/minecraft/class_5218;)Ljava/nio/file/Path; ARG 1 savePath METHOD method_27013 readLevelProperties (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5359;)Lnet/minecraft/class_5219; + ARG 2 dataPackSettings METHOD method_27014 getIconFile ()Ljava/util/Optional; METHOD method_27015 deleteSessionLock ()V METHOD method_27016 createBackup ()J @@ -55,7 +66,12 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage METHOD method_27424 getWorldDirectory (Lnet/minecraft/class_5321;)Ljava/nio/file/Path; ARG 1 key METHOD method_27425 backupLevelDataFile (Lnet/minecraft/class_5455;Lnet/minecraft/class_5219;)V + ARG 1 registryManager + ARG 2 saveProperties METHOD method_27426 backupLevelDataFile (Lnet/minecraft/class_5455;Lnet/minecraft/class_5219;Lnet/minecraft/class_2487;)V + ARG 1 registryManager + ARG 2 saveProperties + ARG 3 nbt METHOD method_27427 createSaveHandler ()Lnet/minecraft/class_29; METHOD method_27428 (Lnet/minecraft/class_5218;)Ljava/nio/file/Path; ARG 1 path diff --git a/mappings/net/minecraft/world/poi/PointOfInterestSet.mapping b/mappings/net/minecraft/world/poi/PointOfInterestSet.mapping index ec81b18f59..6c02e3feba 100644 --- a/mappings/net/minecraft/world/poi/PointOfInterestSet.mapping +++ b/mappings/net/minecraft/world/poi/PointOfInterestSet.mapping @@ -21,6 +21,7 @@ CLASS net/minecraft/class_4157 net/minecraft/world/poi/PointOfInterestSet ARG 1 pos ARG 2 predicate METHOD method_19150 get (Ljava/util/function/Predicate;Lnet/minecraft/class_4153$class_4155;)Ljava/util/stream/Stream; + ARG 1 predicate ARG 2 occupationStatus METHOD method_19153 releaseTicket (Lnet/minecraft/class_2338;)Z ARG 1 pos diff --git a/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping b/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping index 68732581ef..f6f9f89587 100644 --- a/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping +++ b/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage FIELD field_18484 pointOfInterestDistanceTracker Lnet/minecraft/class_4153$class_4154; FIELD field_20688 preloadedChunks Lit/unimi/dsi/fastutil/longs/LongSet; METHOD (Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;ZLnet/minecraft/class_5539;)V + ARG 1 path ARG 2 dataFixer ARG 3 dsync ARG 4 world @@ -15,6 +16,8 @@ CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage METHOD method_19116 test (Lnet/minecraft/class_2338;Ljava/util/function/Predicate;)Z ARG 1 pos ARG 2 predicate + METHOD method_19117 (Lnet/minecraft/class_2338;Ljava/util/function/Predicate;Lnet/minecraft/class_4157;)Ljava/lang/Boolean; + ARG 2 poiSet METHOD method_19118 getDistanceFromNearestOccupied (Lnet/minecraft/class_4076;)I ARG 1 pos METHOD method_19121 (Ljava/util/function/Predicate;Lnet/minecraft/class_4153$class_4155;Lnet/minecraft/class_1923;)Ljava/util/stream/Stream; @@ -50,6 +53,14 @@ CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage METHOD method_19133 isOccupied (J)Z ARG 1 pos METHOD method_19510 initForPalette (Lnet/minecraft/class_1923;Lnet/minecraft/class_2826;)V + ARG 1 chunkPos + ARG 2 chunkSection + METHOD method_19511 (Lnet/minecraft/class_2826;Ljava/util/function/BiConsumer;Lnet/minecraft/class_2338;)V + ARG 2 pos + METHOD method_19512 (Ljava/util/function/BiConsumer;Lnet/minecraft/class_2338;Lnet/minecraft/class_4158;)V + ARG 2 poiType + METHOD method_20004 (Ljava/util/function/Predicate;Lnet/minecraft/class_4156;)Z + ARG 1 poi METHOD method_20005 getPosition (Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lnet/minecraft/class_4153$class_4155;Lnet/minecraft/class_2338;ILjava/util/Random;)Ljava/util/Optional; ARG 1 typePredicate ARG 2 positionPredicate @@ -68,7 +79,14 @@ CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage ARG 3 radius ARG 4 occupationStatus METHOD method_20345 shouldScan (Lnet/minecraft/class_2826;)Z + ARG 0 chunkSection + METHOD method_20346 (Lnet/minecraft/class_2826;Lnet/minecraft/class_4076;Lnet/minecraft/class_4157;)V + ARG 3 poiSet METHOD method_20348 scanAndPopulate (Lnet/minecraft/class_2826;Lnet/minecraft/class_4076;Ljava/util/function/BiConsumer;)V + ARG 1 chunkSection + ARG 2 sectionPos + METHOD method_20592 (Lnet/minecraft/class_4157;)Ljava/lang/Boolean; + ARG 0 poiSet METHOD method_21647 getPositions (Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lnet/minecraft/class_2338;ILnet/minecraft/class_4153$class_4155;)Ljava/util/stream/Stream; ARG 1 typePredicate ARG 2 posPredicate @@ -86,6 +104,10 @@ CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage ARG 2 pos ARG 3 radius COMMENT the radius in blocks + METHOD method_22441 (Lnet/minecraft/class_1923;)Z + ARG 1 chunkPos + METHOD method_22443 (Lnet/minecraft/class_4076;)Lcom/mojang/datafixers/util/Pair; + ARG 1 sectionPos METHOD method_26339 hasTypeAt (Lnet/minecraft/class_4158;Lnet/minecraft/class_2338;)Z ARG 1 type ARG 2 pos @@ -97,6 +119,10 @@ CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage ARG 3 pos ARG 4 radius ARG 5 occupationStatus + METHOD method_33580 (Lnet/minecraft/class_2338;Lnet/minecraft/class_4157;)Ljava/util/Optional; + ARG 1 poiSet + METHOD method_33581 (Lnet/minecraft/class_2338;Lnet/minecraft/class_4157;)Ljava/lang/Boolean; + ARG 1 poiSet METHOD method_33582 (Lnet/minecraft/class_2338;Lnet/minecraft/class_4157;)V ARG 1 poiSet METHOD method_34712 getNearestPosition (Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lnet/minecraft/class_2338;ILnet/minecraft/class_4153$class_4155;)Ljava/util/Optional; @@ -105,6 +131,8 @@ CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage ARG 3 pos ARG 4 radius ARG 5 occupationStatus + METHOD method_35154 (Lnet/minecraft/class_2338;Lnet/minecraft/class_4157;)Ljava/lang/Integer; + ARG 1 poiSet METHOD method_35155 getFreeTickets (Lnet/minecraft/class_2338;)I ARG 1 pos CLASS class_4154 PointOfInterestDistanceTracker diff --git a/mappings/net/minecraft/world/poi/PointOfInterestType.mapping b/mappings/net/minecraft/world/poi/PointOfInterestType.mapping index e13537b3e5..6621d08d3a 100644 --- a/mappings/net/minecraft/world/poi/PointOfInterestType.mapping +++ b/mappings/net/minecraft/world/poi/PointOfInterestType.mapping @@ -34,6 +34,8 @@ CLASS net/minecraft/class_4158 net/minecraft/world/poi/PointOfInterestType ARG 0 state METHOD method_20354 setup (Lnet/minecraft/class_4158;)Lnet/minecraft/class_4158; ARG 0 poiType + METHOD method_20355 (Lnet/minecraft/class_4158;Lnet/minecraft/class_2680;)V + ARG 1 state METHOD method_20356 getAllStatesOf (Lnet/minecraft/class_2248;)Ljava/util/Set; ARG 0 block METHOD method_20357 register (Ljava/lang/String;Ljava/util/Set;II)Lnet/minecraft/class_4158; diff --git a/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping b/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping index 3bb0fb93ff..57c3ad42f0 100644 --- a/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping +++ b/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_5565 net/minecraft/world/storage/EntityChunkDataAccess FIELD field_34056 taskExecutor Lnet/minecraft/class_3846; METHOD (Lnet/minecraft/class_3218;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;ZLjava/util/concurrent/Executor;)V ARG 1 world + ARG 2 path ARG 3 dataFixer ARG 4 dsync ARG 5 executor diff --git a/mappings/net/minecraft/world/storage/RegionFile.mapping b/mappings/net/minecraft/world/storage/RegionFile.mapping index b9f0466d17..524add730c 100644 --- a/mappings/net/minecraft/world/storage/RegionFile.mapping +++ b/mappings/net/minecraft/world/storage/RegionFile.mapping @@ -8,12 +8,15 @@ CLASS net/minecraft/class_2861 net/minecraft/world/storage/RegionFile FIELD field_20440 saveTimes Ljava/nio/IntBuffer; FIELD field_20441 sectors Lnet/minecraft/class_4485; FIELD field_20657 directory Ljava/nio/file/Path; + FIELD field_31421 FILE_EXTENSION Ljava/lang/String; METHOD (Ljava/nio/file/Path;Ljava/nio/file/Path;Lnet/minecraft/class_4486;Z)V ARG 1 file ARG 2 directory ARG 3 outputChunkStreamVersion ARG 4 dsync METHOD (Ljava/nio/file/Path;Ljava/nio/file/Path;Z)V + ARG 1 file + ARG 2 directory ARG 3 dsync METHOD method_12419 getSectorData (Lnet/minecraft/class_1923;)I ARG 1 pos @@ -49,6 +52,7 @@ CLASS net/minecraft/class_2861 net/minecraft/world/storage/RegionFile METHOD method_22413 getExternalChunkPath (Lnet/minecraft/class_1923;)Ljava/nio/file/Path; ARG 1 chunkPos METHOD method_26981 sync ()V + METHOD method_31739 getEpochTimeSeconds ()I CLASS class_2862 ChunkBuffer FIELD field_17656 pos Lnet/minecraft/class_1923; METHOD (Lnet/minecraft/class_2861;Lnet/minecraft/class_1923;)V diff --git a/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping b/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping index bd9a2bc69f..b56d715f91 100644 --- a/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping +++ b/mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping @@ -8,7 +8,9 @@ CLASS net/minecraft/class_4180 net/minecraft/world/storage/SerializingRegionBase FIELD field_21505 worker Lnet/minecraft/class_4698; FIELD field_24750 codecFactory Ljava/util/function/Function; FIELD field_27240 world Lnet/minecraft/class_5539; + FIELD field_31427 SECTIONS_KEY Ljava/lang/String; METHOD (Ljava/nio/file/Path;Ljava/util/function/Function;Ljava/util/function/Function;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_4284;ZLnet/minecraft/class_5539;)V + ARG 1 path ARG 2 codecFactory ARG 3 factory ARG 4 dataFixer @@ -24,6 +26,7 @@ CLASS net/minecraft/class_4180 net/minecraft/world/storage/SerializingRegionBase METHOD method_19291 onLoad (J)V ARG 1 pos METHOD method_19292 isPosInvalid (J)Z + ARG 1 pos METHOD method_19293 getIfLoaded (J)Ljava/util/Optional; ARG 1 pos METHOD method_19294 get (J)Ljava/util/Optional; @@ -34,8 +37,13 @@ CLASS net/minecraft/class_4180 net/minecraft/world/storage/SerializingRegionBase ARG 1 pos ARG 3 data METHOD method_20369 getDataVersion (Lcom/mojang/serialization/Dynamic;)I + ARG 0 dynamic METHOD method_20370 save (Lnet/minecraft/class_1923;)V + ARG 1 chunkPos METHOD method_20436 saveChunk (Lnet/minecraft/class_1923;)V ARG 1 pos METHOD method_20621 loadNbt (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2487; ARG 1 pos + METHOD method_33637 chunkSectionPosAsLong (Lnet/minecraft/class_1923;I)J + ARG 0 chunkPos + ARG 1 y diff --git a/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping index a653c89b11..bb25aead97 100644 --- a/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping +++ b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/class_3977 net/minecraft/world/storage/VersionedChunkStorage ARG 1 worldKey ARG 2 persistentStateManagerFactory ARG 3 nbt + ARG 4 generatorCodecKey METHOD method_17908 getDataVersion (Lnet/minecraft/class_2487;)I ARG 0 nbt METHOD method_17910 setNbt (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)V @@ -18,3 +19,9 @@ CLASS net/minecraft/class_3977 net/minecraft/world/storage/VersionedChunkStorage METHOD method_23696 getNbt (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2487; ARG 1 chunkPos METHOD method_23697 completeAll ()V + METHOD method_39798 (Lnet/minecraft/class_2487;Lnet/minecraft/class_5321;)V + ARG 1 key + METHOD method_39799 saveContextToNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_5321;Ljava/util/Optional;)V + ARG 0 nbt + ARG 1 worldKey + ARG 2 generatorCodecKey diff --git a/mappings/net/minecraft/world/timer/FunctionTimerCallback.mapping b/mappings/net/minecraft/world/timer/FunctionTimerCallback.mapping index eedbd73d39..e93c1d5d6b 100644 --- a/mappings/net/minecraft/world/timer/FunctionTimerCallback.mapping +++ b/mappings/net/minecraft/world/timer/FunctionTimerCallback.mapping @@ -2,4 +2,6 @@ CLASS net/minecraft/class_231 net/minecraft/world/timer/FunctionTimerCallback FIELD field_1304 name Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2960;)V ARG 1 name + METHOD method_17938 (Lnet/minecraft/class_2991;Lnet/minecraft/class_2158;)V + ARG 1 function CLASS class_232 Serializer diff --git a/mappings/net/minecraft/world/timer/Timer.mapping b/mappings/net/minecraft/world/timer/Timer.mapping index d60945e56f..dee1400375 100644 --- a/mappings/net/minecraft/world/timer/Timer.mapping +++ b/mappings/net/minecraft/world/timer/Timer.mapping @@ -9,6 +9,13 @@ CLASS net/minecraft/class_236 net/minecraft/world/timer/Timer FIELD field_31878 TRIGGER_TIME_KEY Ljava/lang/String; METHOD (Lnet/minecraft/class_233;)V ARG 1 timerCallbackSerializer + METHOD (Lnet/minecraft/class_233;Ljava/util/stream/Stream;)V + ARG 1 timerCallbackSerializer + METHOD method_21904 (Lnet/minecraft/class_236$class_237;)Lcom/google/common/primitives/UnsignedLong; + ARG 0 event + METHOD method_21905 (Lnet/minecraft/class_236$class_237;)J + ARG 0 event + METHOD method_22592 getEventNames ()Ljava/util/Set; METHOD method_980 serialize (Lnet/minecraft/class_236$class_237;)Lnet/minecraft/class_2487; ARG 1 event METHOD method_982 toNbt ()Lnet/minecraft/class_2499;