diff --git a/mappings/net/minecraft/block/DeadBushBlock.mapping b/mappings/net/minecraft/block/DeadBushBlock.mapping index 7132868c8f..b430003f66 100644 --- a/mappings/net/minecraft/block/DeadBushBlock.mapping +++ b/mappings/net/minecraft/block/DeadBushBlock.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_2311 net/minecraft/block/DeadBushBlock FIELD field_10910 SHAPE Lnet/minecraft/class_265; FIELD field_46332 CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_56458 IDLE_SOUND_CHANCE I + FIELD field_56459 IDLE_SOUND_BADLANDS_CHANCE_PENALTY I diff --git a/mappings/net/minecraft/block/entity/SculkSpreadManager.mapping b/mappings/net/minecraft/block/entity/SculkSpreadManager.mapping index e365154a0c..04abebcf53 100644 --- a/mappings/net/minecraft/block/entity/SculkSpreadManager.mapping +++ b/mappings/net/minecraft/block/entity/SculkSpreadManager.mapping @@ -31,6 +31,7 @@ CLASS net/minecraft/class_7128 net/minecraft/block/entity/SculkSpreadManager ARG 1 pos ARG 2 charge METHOD method_41483 readNbt (Lnet/minecraft/class_2487;)V + ARG 1 nbt METHOD method_41485 createWorldGen ()Lnet/minecraft/class_7128; METHOD method_41486 writeNbt (Lnet/minecraft/class_2487;)V ARG 1 nbt diff --git a/mappings/net/minecraft/datafixer/FixUtil.mapping b/mappings/net/minecraft/datafixer/FixUtil.mapping index ce3f5f8dac..ce21cc7d32 100644 --- a/mappings/net/minecraft/datafixer/FixUtil.mapping +++ b/mappings/net/minecraft/datafixer/FixUtil.mapping @@ -2,6 +2,8 @@ CLASS net/minecraft/class_9228 net/minecraft/datafixer/FixUtil METHOD method_56943 fixBlockPos (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; ARG 0 dynamic METHOD method_57182 withType (Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; + ARG 0 type + ARG 1 typed METHOD method_59907 compose ([Ljava/util/function/Function;)Ljava/util/function/Function; ARG 0 fixes METHOD method_61349 typeChangingRule (Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/types/Type;)Lcom/mojang/datafixers/TypeRewriteRule; @@ -16,6 +18,8 @@ CLASS net/minecraft/class_9228 net/minecraft/datafixer/FixUtil ARG 2 applier METHOD method_61352 (Lcom/mojang/serialization/Dynamic;Ljava/util/Map$Entry;)Lcom/mojang/serialization/Dynamic; ARG 1 entry + METHOD method_61353 (Lcom/mojang/serialization/DynamicOps;)Ljava/util/function/Function; + ARG 0 ops METHOD method_61355 createBlockState (Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; ARG 0 id METHOD method_61356 createBlockState (Ljava/lang/String;Ljava/util/Map;)Lcom/mojang/serialization/Dynamic; @@ -26,5 +30,19 @@ CLASS net/minecraft/class_9228 net/minecraft/datafixer/FixUtil METHOD method_61358 (Lcom/mojang/serialization/Dynamic;Ljava/util/Map$Entry;)Lcom/mojang/serialization/Dynamic; ARG 1 entry METHOD method_66040 withType (Lcom/mojang/datafixers/types/Type;Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/datafixers/Typed; + ARG 0 type + ARG 1 value + ARG 2 ops METHOD method_66591 getColorName (I)Ljava/lang/String; ARG 0 index + METHOD method_67330 createBlockPos (Lcom/mojang/serialization/Dynamic;III)Lcom/mojang/serialization/Dynamic; + ARG 0 dynamic + ARG 1 x + ARG 2 y + ARG 3 z + METHOD method_67331 consolidateBlockPos (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; + ARG 0 dynamic + ARG 1 xKey + ARG 2 yKey + ARG 3 zKey + ARG 4 newPosKey diff --git a/mappings/net/minecraft/datafixer/fix/RaidRenamesDataFix.mapping b/mappings/net/minecraft/datafixer/fix/RaidRenamesDataFix.mapping index c4a61b9cec..246519848f 100644 --- a/mappings/net/minecraft/datafixer/fix/RaidRenamesDataFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/RaidRenamesDataFix.mapping @@ -1,3 +1,13 @@ CLASS net/minecraft/class_10729 net/minecraft/datafixer/fix/RaidRenamesDataFix METHOD (Lcom/mojang/datafixers/schemas/Schema;)V ARG 1 outputSchema + METHOD method_67332 (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; + ARG 0 typed + METHOD method_67333 fixRaidsData (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 dynamic + METHOD method_67334 fixRaid (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 dynamic + METHOD method_67335 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 raidsDynamic + METHOD method_67336 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 dynamic diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 98498a9c05..28c4cf7547 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -213,7 +213,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_6037 velocityModified Z FIELD field_6038 lastRenderX D METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)V - ARG 1 entityType + ARG 1 type ARG 2 world METHOD equals (Ljava/lang/Object;)Z ARG 1 o diff --git a/mappings/net/minecraft/sound/AmbientDesertBlockSounds.mapping b/mappings/net/minecraft/sound/AmbientDesertBlockSounds.mapping index c7ea44846d..b4bf6ed4ff 100644 --- a/mappings/net/minecraft/sound/AmbientDesertBlockSounds.mapping +++ b/mappings/net/minecraft/sound/AmbientDesertBlockSounds.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_10739 net/minecraft/sound/AmbientDesertBlockSounds FIELD field_56467 IDLE_SOUND_CHANCE I FIELD field_56468 WIND_SOUND_CHANCE I + FIELD field_56469 REQUIRED_CHECK_DIRECTIONS I + FIELD field_56470 DISTANCE_TO_CHECK I METHOD method_67407 shouldPlayAmbientSoundAt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/test/BlockBasedTestInstance.mapping b/mappings/net/minecraft/test/BlockBasedTestInstance.mapping index 1f2acb5d31..09d0633cbf 100644 --- a/mappings/net/minecraft/test/BlockBasedTestInstance.mapping +++ b/mappings/net/minecraft/test/BlockBasedTestInstance.mapping @@ -13,3 +13,7 @@ CLASS net/minecraft/class_10654 net/minecraft/test/BlockBasedTestInstance METHOD method_66914 findTestBlocks (Lnet/minecraft/class_4516;Lnet/minecraft/class_10641;)Ljava/util/List; ARG 1 context ARG 2 mode + METHOD method_67481 (Lnet/minecraft/class_4516;Lnet/minecraft/class_2338;)Lnet/minecraft/class_10637; + ARG 1 pos + METHOD method_67482 findStartBlockPos (Lnet/minecraft/class_4516;)Lnet/minecraft/class_2338; + ARG 1 context diff --git a/mappings/net/minecraft/test/FunctionTestInstance.mapping b/mappings/net/minecraft/test/FunctionTestInstance.mapping index 4da3fe6312..49f1cdf938 100644 --- a/mappings/net/minecraft/test/FunctionTestInstance.mapping +++ b/mappings/net/minecraft/test/FunctionTestInstance.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_10657 net/minecraft/test/FunctionTestInstance FIELD field_56166 CODEC Lcom/mojang/serialization/MapCodec; FIELD field_56167 function Lnet/minecraft/class_5321; METHOD (Lnet/minecraft/class_5321;Lnet/minecraft/class_10664;)V + ARG 1 function ARG 2 data METHOD method_66921 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/test/TestServer.mapping b/mappings/net/minecraft/test/TestServer.mapping index 05cb156f98..a00f59cc6b 100644 --- a/mappings/net/minecraft/test/TestServer.mapping +++ b/mappings/net/minecraft/test/TestServer.mapping @@ -43,3 +43,5 @@ CLASS net/minecraft/class_6306 net/minecraft/test/TestServer ARG 1 world METHOD method_66987 (Lnet/minecraft/class_6880$class_6883;)Z ARG 0 instance + METHOD method_67486 logFailure (Lnet/minecraft/class_4517;)V + ARG 0 state diff --git a/mappings/net/minecraft/util/InvalidHierarchicalFileException.mapping b/mappings/net/minecraft/util/InvalidHierarchicalFileException.mapping index fdcaa2b75d..a6e248f2c4 100644 --- a/mappings/net/minecraft/util/InvalidHierarchicalFileException.mapping +++ b/mappings/net/minecraft/util/InvalidHierarchicalFileException.mapping @@ -3,6 +3,8 @@ CLASS net/minecraft/class_2973 net/minecraft/util/InvalidHierarchicalFileExcepti COMMENT the invalid element in a hierarchical tree structure (such as JSON). FIELD field_13371 invalidFiles Ljava/util/List; FIELD field_13372 message Ljava/lang/String; + METHOD (Ljava/lang/String;)V + ARG 1 message METHOD (Ljava/lang/String;Ljava/lang/Throwable;)V ARG 1 message ARG 2 cause diff --git a/mappings/net/minecraft/util/InvalidIdentifierException.mapping b/mappings/net/minecraft/util/InvalidIdentifierException.mapping index d04669a342..40ad85e836 100644 --- a/mappings/net/minecraft/util/InvalidIdentifierException.mapping +++ b/mappings/net/minecraft/util/InvalidIdentifierException.mapping @@ -2,6 +2,8 @@ CLASS net/minecraft/class_151 net/minecraft/util/InvalidIdentifierException COMMENT An exception thrown when parsing or constructing an {@link Identifier} COMMENT that contains an invalid character. This should not be caught, instead COMMENT {@link Identifier#tryParse} or {@link Identifier#of} should be used. + METHOD (Ljava/lang/String;)V + ARG 1 message METHOD (Ljava/lang/String;Ljava/lang/Throwable;)V ARG 1 message ARG 2 throwable diff --git a/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping b/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping index 205b25cb3b..cc9dfed465 100644 --- a/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping +++ b/mappings/net/minecraft/util/collection/PackedIntegerArray.mapping @@ -32,3 +32,5 @@ CLASS net/minecraft/class_3508 net/minecraft/util/collection/PackedIntegerArray METHOD method_27284 getStorageIndex (I)I ARG 1 index CLASS class_6685 InvalidLengthException + METHOD (Ljava/lang/String;)V + ARG 1 message diff --git a/mappings/net/minecraft/village/raid/Raid.mapping b/mappings/net/minecraft/village/raid/Raid.mapping index 7bdefcd548..f9e871bc86 100644 --- a/mappings/net/minecraft/village/raid/Raid.mapping +++ b/mappings/net/minecraft/village/raid/Raid.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_3765 net/minecraft/village/raid/Raid FIELD field_16618 waveToRaiders Ljava/util/Map; FIELD field_16620 totalHealth F FIELD field_16621 wavesSpawned I - FIELD field_16623 badOmenLevel I + FIELD field_16623 raidOmenLevel I FIELD field_19016 EVENT_TEXT Lnet/minecraft/class_2561; FIELD field_19019 VICTORY_TITLE Lnet/minecraft/class_2561; FIELD field_19020 DEFEAT_TITLE Lnet/minecraft/class_2561; @@ -27,7 +27,28 @@ CLASS net/minecraft/class_3765 net/minecraft/village/raid/Raid FIELD field_30686 DEFAULT_PRE_RAID_TICKS I FIELD field_30689 MAX_ACTIVE_TICKS I FIELD field_53976 RAVAGER_SPAWN_LOCATION Lnet/minecraft/class_9168; + FIELD field_56439 CODEC Lcom/mojang/serialization/MapCodec; + METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_1267;)V + ARG 1 center + ARG 2 difficulty + METHOD (ZZJIIIIFILnet/minecraft/class_3765$class_4259;Lnet/minecraft/class_2338;Ljava/util/Set;)V + ARG 1 started + ARG 2 active + ARG 3 ticksActive + ARG 5 raidOmenLevel + ARG 6 wavesSpawned + ARG 7 preRaidTicks + ARG 8 postRaidTicks + ARG 9 totalHealth + ARG 10 waveCount + ARG 11 status + ARG 12 center + ARG 13 heroesOfTheVillage METHOD method_16487 addToWave (Lnet/minecraft/class_3218;ILnet/minecraft/class_3763;Z)Z + ARG 1 world + ARG 2 wave + ARG 3 raider + ARG 4 countHealth METHOD method_16490 getGroupsSpawned ()I METHOD method_16491 setWaveCaptain (ILnet/minecraft/class_3763;)V ARG 1 wave @@ -37,32 +58,53 @@ CLASS net/minecraft/class_3765 net/minecraft/village/raid/Raid METHOD method_16496 getCaptain (I)Lnet/minecraft/class_3763; ARG 1 wave METHOD method_16499 updateBarToPlayers (Lnet/minecraft/class_3218;)V + ARG 1 world METHOD method_16500 removeLeader (I)V ARG 1 wave METHOD method_16501 isInRaidDistance ()Ljava/util/function/Predicate; METHOD method_16504 isActive ()Z METHOD method_16505 addToWave (Lnet/minecraft/class_3218;ILnet/minecraft/class_3763;)Z + ARG 1 world + ARG 2 wave + ARG 3 raider METHOD method_16506 invalidate ()V METHOD method_16508 (Ljava/lang/Integer;)Ljava/util/Set; ARG 0 wavex METHOD method_16509 tick (Lnet/minecraft/class_3218;)V + ARG 1 world METHOD method_16510 removeFromWave (Lnet/minecraft/class_3218;Lnet/minecraft/class_3763;Z)V + ARG 1 world + ARG 2 raider + ARG 3 countHealth METHOD method_16513 getCurrentRaiderHealth ()F METHOD method_16514 getMaxAcceptableBadOmenLevel ()I METHOD method_16516 addRaider (Lnet/minecraft/class_3218;ILnet/minecraft/class_3763;Lnet/minecraft/class_2338;Z)V + ARG 1 world + ARG 2 wave + ARG 3 raider + ARG 4 pos + ARG 5 existing METHOD method_16517 getRaiderCount ()I METHOD method_16518 start (Lnet/minecraft/class_3222;)Z ARG 1 player METHOD method_16519 canSpawnRaiders ()Z METHOD method_16520 markDirty (Lnet/minecraft/class_3218;)V + ARG 1 world METHOD method_16521 playRaidHorn (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V + ARG 1 world + ARG 2 pos METHOD method_16522 spawnNextWave (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V + ARG 1 world + ARG 2 pos METHOD method_16523 updateBar ()V METHOD method_16524 hasStarted ()Z METHOD method_16525 findRandomRaidersSpawnLocation (Lnet/minecraft/class_3218;I)Lnet/minecraft/class_2338; + ARG 1 world + ARG 2 proximity METHOD method_16832 isFinished ()Z METHOD method_16833 shouldSpawnMoreGroups ()Z METHOD method_16834 removeObsoleteRaiders (Lnet/minecraft/class_3218;)V + ARG 1 world METHOD method_20012 hasSpawnedFinalWave ()Z METHOD method_20013 hasExtraWave ()Z METHOD method_20014 hasSpawnedExtraWave ()Z @@ -88,17 +130,47 @@ CLASS net/minecraft/class_3765 net/minecraft/village/raid/Raid METHOD method_20024 hasLost ()Z METHOD method_20025 getEnchantmentChance ()F METHOD method_20267 getRaidersSpawnLocation (Lnet/minecraft/class_3218;)Ljava/util/Optional; + ARG 1 world METHOD method_20509 setCenter (Lnet/minecraft/class_2338;)V ARG 1 center METHOD method_20510 (Lnet/minecraft/class_2338;)D ARG 1 pos METHOD method_20511 moveRaidCenter (Lnet/minecraft/class_3218;)V + ARG 1 world METHOD method_35211 setBadOmenLevel (I)V ARG 1 badOmenLevel METHOD method_35212 getTotalHealth ()F METHOD method_35213 getAllRaiders ()Ljava/util/Set; METHOD method_61558 createOminousBanner (Lnet/minecraft/class_7871;)Lnet/minecraft/class_1799; ARG 0 bannerPatternLookup + METHOD method_67361 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_67362 (Lnet/minecraft/class_3765;)Ljava/util/Set; + ARG 0 raid + METHOD method_67363 (Lnet/minecraft/class_3222;)Z + ARG 1 player + METHOD method_67364 (Lnet/minecraft/class_3765;)Lnet/minecraft/class_2338; + ARG 0 raid + METHOD method_67365 (Lnet/minecraft/class_3765;)Lnet/minecraft/class_3765$class_4259; + ARG 0 raid + METHOD method_67366 (Lnet/minecraft/class_3765;)Ljava/lang/Integer; + ARG 0 raid + METHOD method_67367 (Lnet/minecraft/class_3765;)Ljava/lang/Float; + ARG 0 raid + METHOD method_67368 (Lnet/minecraft/class_3765;)Ljava/lang/Integer; + ARG 0 raid + METHOD method_67370 (Lnet/minecraft/class_3765;)Ljava/lang/Integer; + ARG 0 raid + METHOD method_67371 (Lnet/minecraft/class_3765;)Ljava/lang/Integer; + ARG 0 raid + METHOD method_67372 (Lnet/minecraft/class_3765;)Ljava/lang/Integer; + ARG 0 raid + METHOD method_67373 (Lnet/minecraft/class_3765;)Ljava/lang/Long; + ARG 0 raid + METHOD method_67374 (Lnet/minecraft/class_3765;)Ljava/lang/Boolean; + ARG 0 raid + METHOD method_67375 (Lnet/minecraft/class_3765;)Ljava/lang/Boolean; + ARG 0 raid CLASS class_3766 Member FIELD field_16628 countInWave [I FIELD field_16629 type Lnet/minecraft/class_1299; @@ -107,3 +179,7 @@ CLASS net/minecraft/class_3765 net/minecraft/village/raid/Raid ARG 3 type ARG 4 countInWave CLASS class_4259 Status + FIELD field_56440 CODEC Lcom/mojang/serialization/Codec; + FIELD field_56441 id Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 id diff --git a/mappings/net/minecraft/world/PersistentStateManager.mapping b/mappings/net/minecraft/world/PersistentStateManager.mapping index 9d2b241d6e..bec8ae3f24 100644 --- a/mappings/net/minecraft/world/PersistentStateManager.mapping +++ b/mappings/net/minecraft/world/PersistentStateManager.mapping @@ -26,7 +26,7 @@ CLASS net/minecraft/class_26 net/minecraft/world/PersistentStateManager ARG 2 dataFixTypes ARG 3 currentSaveVersion METHOD method_17924 getOrCreate (Lnet/minecraft/class_10741;)Lnet/minecraft/class_18; - ARG 1 tytpe + ARG 1 type METHOD method_20786 get (Lnet/minecraft/class_10741;)Lnet/minecraft/class_18; ARG 1 type METHOD method_61873 startSaving ()Ljava/util/concurrent/CompletableFuture; diff --git a/mappings/net/minecraft/world/updater/WorldUpdater.mapping b/mappings/net/minecraft/world/updater/WorldUpdater.mapping index c63a81ec87..6687cbfa83 100644 --- a/mappings/net/minecraft/world/updater/WorldUpdater.mapping +++ b/mappings/net/minecraft/world/updater/WorldUpdater.mapping @@ -29,6 +29,10 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater METHOD (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_5219;Lnet/minecraft/class_5455;ZZ)V ARG 1 session ARG 2 dataFixer + ARG 3 saveProperties + ARG 4 registries + ARG 5 eraseCache + ARG 6 recreateRegionFiles METHOD method_28304 getWorlds ()Ljava/util/Set; METHOD method_5393 getProgress (Lnet/minecraft/class_5321;)F ARG 1 world