diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index f3e2bb9cb5..fd854ded20 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -274,6 +274,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 2 world ARG 3 tooltip ARG 4 options + ARG 5 registryManager METHOD method_9574 getPickStack (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_1799; COMMENT {@return the new item stack when using pick block functionality} COMMENT diff --git a/mappings/net/minecraft/block/Blocks.mapping b/mappings/net/minecraft/block/Blocks.mapping index 94668f620c..269d1bcede 100644 --- a/mappings/net/minecraft/block/Blocks.mapping +++ b/mappings/net/minecraft/block/Blocks.mapping @@ -196,6 +196,8 @@ CLASS net/minecraft/class_2246 net/minecraft/block/Blocks ARG 0 state METHOD method_55133 createOldStairsBlock (Lnet/minecraft/class_2248;)Lnet/minecraft/class_2248; ARG 0 block + METHOD method_56717 (Lnet/minecraft/class_2680;)I + ARG 0 state METHOD method_9492 register (Ljava/lang/String;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2248; ARG 0 id ARG 1 block diff --git a/mappings/net/minecraft/block/ShulkerBoxBlock.mapping b/mappings/net/minecraft/block/ShulkerBoxBlock.mapping index d29257b39a..ff112ae904 100644 --- a/mappings/net/minecraft/block/ShulkerBoxBlock.mapping +++ b/mappings/net/minecraft/block/ShulkerBoxBlock.mapping @@ -29,6 +29,8 @@ CLASS net/minecraft/class_2480 net/minecraft/block/ShulkerBoxBlock ARG 1 world ARG 2 pos ARG 3 entity + METHOD method_38234 (Lnet/minecraft/class_1799;Lnet/minecraft/class_4538;Lnet/minecraft/class_2627;)V + ARG 2 blockEntity METHOD method_47378 (Ljava/util/EnumMap;)V ARG 0 map METHOD method_54040 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; diff --git a/mappings/net/minecraft/block/VaultBlock.mapping b/mappings/net/minecraft/block/VaultBlock.mapping index a7222cd6d7..61b1f21cb7 100644 --- a/mappings/net/minecraft/block/VaultBlock.mapping +++ b/mappings/net/minecraft/block/VaultBlock.mapping @@ -2,3 +2,13 @@ CLASS net/minecraft/class_9197 net/minecraft/block/VaultBlock FIELD field_48856 CODEC Lcom/mojang/serialization/MapCodec; FIELD field_48857 VAULT_STATE Lnet/minecraft/class_2769; FIELD field_48858 FACING Lnet/minecraft/class_2753; + METHOD method_56718 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_9199;)V + ARG 1 worldx + ARG 2 pos + ARG 3 statex + ARG 4 blockEntity + METHOD method_56719 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_9199;)V + ARG 0 worldx + ARG 1 pos + ARG 2 statex + ARG 3 blockEntity diff --git a/mappings/net/minecraft/block/entity/BlockEntity.mapping b/mappings/net/minecraft/block/entity/BlockEntity.mapping index cc438d6375..2d99f61fce 100644 --- a/mappings/net/minecraft/block/entity/BlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntity.mapping @@ -76,6 +76,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity ARG 0 pos ARG 1 state ARG 2 nbt + ARG 3 registryLookup METHOD method_11007 writeNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)V COMMENT Writes data to {@code nbt}. Subclasses should override this if they COMMENT store a persistent data. @@ -86,7 +87,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity COMMENT COMMENT @see #readNbt ARG 1 nbt - METHOD method_11007 writeNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)V + ARG 2 registryLookup METHOD method_11010 getCachedState ()Lnet/minecraft/class_2680; COMMENT {@return the cached block state at the block entity's position} COMMENT @@ -115,8 +116,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity COMMENT COMMENT @see #writeNbt ARG 1 nbt - METHOD method_11014 readNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)V - ARG 1 nbt + ARG 2 registryLookup METHOD method_11015 isRemoved ()Z METHOD method_11016 getPos ()Lnet/minecraft/class_2338; COMMENT {@return the block entity's position} @@ -136,6 +136,9 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity COMMENT

To send all NBT data of this block entity saved to disk, return {@link #createNbt}. COMMENT COMMENT @see #toUpdatePacket + ARG 1 registryLookup + METHOD method_17897 (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;Ljava/lang/String;Lnet/minecraft/class_2586;)Lnet/minecraft/class_2586; + ARG 3 blockEntity METHOD method_17899 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/lang/String;Lnet/minecraft/class_2591;)Lnet/minecraft/class_2586; ARG 3 type METHOD method_31662 setWorld (Lnet/minecraft/class_1937;)V @@ -183,6 +186,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity COMMENT Sets {@code stack}'s {@code net.minecraft.item.BlockItem#BLOCK_ENTITY_TAG_KEY} COMMENT NBT value to {@linkplain #createNbt the block entity's NBT data}. ARG 1 stack + ARG 2 registryLookup METHOD method_38241 writeIdToNbt (Lnet/minecraft/class_2487;)V COMMENT Writes the block entity type ID to {@code nbt} under the {@code id} key. COMMENT @@ -198,6 +202,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity COMMENT COMMENT @see #createNbt COMMENT @see #createNbtWithId + ARG 1 registryLookup METHOD method_38243 createNbtWithId (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487; COMMENT {@return the block entity's NBT data with block entity type ID} COMMENT @@ -206,6 +211,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity COMMENT COMMENT @see #createNbt COMMENT @see #createNbtWithIdentifyingData + ARG 1 registryLookup METHOD method_38244 createNbt (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487; COMMENT {@return the block entity's NBT data} COMMENT @@ -215,6 +221,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity COMMENT @see #writeNbt COMMENT @see #createNbtWithIdentifyingData COMMENT @see #createNbtWithId + ARG 1 registryLookup METHOD method_5431 markDirty ()V COMMENT Marks this block entity as dirty and that it needs to be saved. COMMENT This also triggers {@linkplain World#updateComparators comparator update}. diff --git a/mappings/net/minecraft/block/entity/TrialSpawnerBlockEntity.mapping b/mappings/net/minecraft/block/entity/TrialSpawnerBlockEntity.mapping index 846759018d..561b840da1 100644 --- a/mappings/net/minecraft/block/entity/TrialSpawnerBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/TrialSpawnerBlockEntity.mapping @@ -4,4 +4,8 @@ CLASS net/minecraft/class_8961 net/minecraft/block/entity/TrialSpawnerBlockEntit METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state + METHOD method_55147 (Lnet/minecraft/class_8963;)V + ARG 1 spawner + METHOD method_55148 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V + ARG 1 nbtx METHOD method_55150 getSpawner ()Lnet/minecraft/class_8963; diff --git a/mappings/net/minecraft/block/entity/VaultBlockEntity.mapping b/mappings/net/minecraft/block/entity/VaultBlockEntity.mapping index db74865993..31084ead4e 100644 --- a/mappings/net/minecraft/block/entity/VaultBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/VaultBlockEntity.mapping @@ -1 +1,132 @@ CLASS net/minecraft/class_9199 net/minecraft/block/entity/VaultBlockEntity + FIELD field_48865 LOGGER Lorg/slf4j/Logger; + FIELD field_48866 serverData Lnet/minecraft/class_9204; + FIELD field_48867 sharedData Lnet/minecraft/class_9205; + FIELD field_48868 clientData Lnet/minecraft/class_9202; + FIELD field_48869 config Lnet/minecraft/class_9203; + METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V + ARG 1 pos + ARG 2 state + METHOD method_56729 encodeValue (Lcom/mojang/serialization/Codec;Ljava/lang/Object;)Lnet/minecraft/class_2520; + ARG 0 codec + ARG 1 value + METHOD method_56730 setConfig (Lnet/minecraft/class_9203;)V + ARG 1 config + METHOD method_56731 getServerData ()Lnet/minecraft/class_9204; + METHOD method_56733 (Lnet/minecraft/class_9203;)V + ARG 1 config + METHOD method_56734 (Lnet/minecraft/class_2487;)V + ARG 1 nbt + METHOD method_56735 getSharedData ()Lnet/minecraft/class_9205; + METHOD method_56736 getClientData ()Lnet/minecraft/class_9202; + METHOD method_56737 getConfig ()Lnet/minecraft/class_9203; + CLASS class_9200 Client + METHOD method_56738 spawnConnectedParticlesFor (Lnet/minecraft/class_1937;Lnet/minecraft/class_243;Lnet/minecraft/class_1657;)V + ARG 0 world + ARG 1 pos + ARG 2 player + METHOD method_56739 spawnDeactivateParticles (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + ARG 0 world + ARG 1 pos + METHOD method_56740 spawnAmbientParticles (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_9205;)V + ARG 0 world + ARG 1 pos + ARG 2 sharedData + METHOD method_56741 tick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_9202;Lnet/minecraft/class_9205;)V + ARG 0 world + ARG 1 pos + ARG 2 state + ARG 3 clientData + ARG 4 sharedData + METHOD method_56742 spawnActivateParticles (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_9205;)V + ARG 0 world + ARG 1 pos + ARG 2 state + ARG 3 sharedData + METHOD method_56743 hasDisplayItem (Lnet/minecraft/class_9205;)Z + ARG 0 sharedData + METHOD method_56744 getDeactivateParticlesPos (Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Lnet/minecraft/class_243; + ARG 0 pos + ARG 1 random + METHOD method_56745 isPlayerWithinConnectedParticlesRange (Lnet/minecraft/class_2338;Lnet/minecraft/class_9205;Lnet/minecraft/class_1657;)Z + ARG 0 pos + ARG 1 sharedData + ARG 2 player + METHOD method_56746 getConnectedParticlesOrigin (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Lnet/minecraft/class_243; + ARG 0 pos + ARG 1 direction + METHOD method_56747 playAmbientSound (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_9205;)V + ARG 0 world + ARG 1 pos + ARG 2 sharedData + METHOD method_56748 spawnConnectedParticles (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_9205;)V + ARG 0 world + ARG 1 pos + ARG 2 state + ARG 3 sharedData + METHOD method_56749 getRegularParticlesPos (Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Lnet/minecraft/class_243; + ARG 0 pos + ARG 1 random + CLASS class_9201 Server + FIELD field_48875 UNLOCK_TIME I + FIELD field_48876 DISPLAY_UPDATE_INTERVAL I + FIELD field_48877 FAILED_UNLOCK_COOLDOWN I + METHOD method_56750 shouldUpdateDisplayItem (JLnet/minecraft/class_9206;)Z + ARG 0 time + ARG 2 state + METHOD method_56751 generateLoot (Lnet/minecraft/class_3218;Lnet/minecraft/class_9203;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;)Ljava/util/List; + ARG 0 world + ARG 1 config + ARG 2 pos + ARG 3 player + METHOD method_56752 playFailedUnlockSound (Lnet/minecraft/class_3218;Lnet/minecraft/class_9204;Lnet/minecraft/class_2338;)V + ARG 0 world + ARG 1 serverData + ARG 2 pos + METHOD method_56753 updateDisplayItem (Lnet/minecraft/class_3218;Lnet/minecraft/class_9206;Lnet/minecraft/class_9203;Lnet/minecraft/class_9205;Lnet/minecraft/class_2338;)V + ARG 0 world + ARG 1 state + ARG 2 config + ARG 3 sharedData + ARG 4 pos + METHOD method_56754 unlock (Lnet/minecraft/class_3218;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_9203;Lnet/minecraft/class_9204;Lnet/minecraft/class_9205;Ljava/util/List;)V + ARG 0 world + ARG 1 state + ARG 2 pos + ARG 3 config + ARG 4 serverData + ARG 5 sharedData + ARG 6 itemsToEject + METHOD method_56755 generateDisplayItem (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2960;)Lnet/minecraft/class_1799; + ARG 0 world + ARG 1 pos + ARG 2 lootTable + METHOD method_56756 tick (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_9203;Lnet/minecraft/class_9204;Lnet/minecraft/class_9205;)V + ARG 0 world + ARG 1 pos + ARG 2 state + ARG 3 config + ARG 4 serverData + ARG 5 sharedData + METHOD method_56757 tryUnlock (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_9203;Lnet/minecraft/class_9204;Lnet/minecraft/class_9205;Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V + ARG 0 world + ARG 1 pos + ARG 2 state + ARG 3 config + ARG 4 serverData + ARG 5 sharedData + ARG 6 player + ARG 7 stack + METHOD method_56758 changeVaultState (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_9203;Lnet/minecraft/class_9205;)V + ARG 0 world + ARG 1 pos + ARG 2 oldState + ARG 3 newState + ARG 4 config + ARG 5 sharedData + METHOD method_56759 isValidKey (Lnet/minecraft/class_9203;Lnet/minecraft/class_1799;)Z + ARG 0 config + ARG 1 stack + METHOD method_56760 canBeUnlocked (Lnet/minecraft/class_9203;Lnet/minecraft/class_9206;)Z + ARG 0 config + ARG 1 state diff --git a/mappings/net/minecraft/block/enums/VaultState.mapping b/mappings/net/minecraft/block/enums/VaultState.mapping index e58b28f767..e54da2d3d3 100644 --- a/mappings/net/minecraft/block/enums/VaultState.mapping +++ b/mappings/net/minecraft/block/enums/VaultState.mapping @@ -1,4 +1,45 @@ CLASS net/minecraft/class_9206 net/minecraft/block/enums/VaultState - METHOD method_56803 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_9203;Lnet/minecraft/class_9204;Lnet/minecraft/class_9205;)Lnet/minecraft/class_9206; + FIELD field_48907 id Ljava/lang/String; + FIELD field_48908 light Lnet/minecraft/class_9206$class_9207; + METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_9206$class_9207;)V + ARG 3 id + ARG 4 light + METHOD method_56801 getLuminance ()I + METHOD method_56802 ejectItem (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;F)V ARG 1 world - CLASS class_9207 LitType + ARG 2 pos + ARG 3 stack + ARG 4 pitchModifier + METHOD method_56803 update (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_9203;Lnet/minecraft/class_9204;Lnet/minecraft/class_9205;)Lnet/minecraft/class_9206; + ARG 1 world + ARG 2 pos + ARG 3 config + ARG 4 serverData + ARG 5 sharedData + METHOD method_56804 updateActiveState (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_9203;Lnet/minecraft/class_9204;Lnet/minecraft/class_9205;D)Lnet/minecraft/class_9206; + ARG 0 world + ARG 1 pos + ARG 2 config + ARG 3 serverData + ARG 4 sharedData + ARG 5 radius + METHOD method_56805 onChangedTo (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_9203;Lnet/minecraft/class_9205;)V + ARG 1 world + ARG 2 pos + ARG 3 config + ARG 4 sharedData + METHOD method_56806 onStateChange (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_9206;Lnet/minecraft/class_9203;Lnet/minecraft/class_9205;)V + ARG 1 world + ARG 2 pos + ARG 3 newState + ARG 4 config + ARG 5 sharedData + METHOD method_56808 onChangedFrom (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_9203;Lnet/minecraft/class_9205;)V + ARG 1 world + ARG 2 pos + ARG 3 config + ARG 4 sharedData + CLASS class_9207 Light + FIELD field_48913 luminance I + METHOD (Ljava/lang/String;II)V + ARG 3 luminance diff --git a/mappings/net/minecraft/block/spawner/EntityDetector.mapping b/mappings/net/minecraft/block/spawner/EntityDetector.mapping index 811b4edcc6..83589d9f7b 100644 --- a/mappings/net/minecraft/block/spawner/EntityDetector.mapping +++ b/mappings/net/minecraft/block/spawner/EntityDetector.mapping @@ -1,17 +1,42 @@ CLASS net/minecraft/class_8962 net/minecraft/block/spawner/EntityDetector FIELD field_47357 SHEEP Lnet/minecraft/class_8962; - FIELD field_48860 EXCEPT_CREATIVE_OR_SPECTATOR Lnet/minecraft/class_8962; - FIELD field_48861 EXCEPT_SPECTATOR Lnet/minecraft/class_8962; + FIELD field_48860 SURVIVAL_PLAYERS Lnet/minecraft/class_8962; + FIELD field_48861 NON_SPECTATOR_PLAYERS Lnet/minecraft/class_8962; METHOD detect (Lnet/minecraft/class_3218;Lnet/minecraft/class_8962$class_9198;Lnet/minecraft/class_2338;D)Ljava/util/List; ARG 1 world - ARG 2 playerDetector - ARG 3 pos - ARG 4 distance - CLASS class_9198 PlayerDetector - FIELD field_48862 DEFAULT Lnet/minecraft/class_8962$class_9198; - METHOD method_56724 detect (Lnet/minecraft/class_3218;Lnet/minecraft/class_5575;Lnet/minecraft/class_238;Ljava/util/function/Predicate;)Ljava/util/List; + ARG 2 selector + ARG 3 center + ARG 4 radius + METHOD method_55155 (Lnet/minecraft/class_3218;Lnet/minecraft/class_8962$class_9198;Lnet/minecraft/class_2338;D)Ljava/util/List; + ARG 0 world + ARG 1 selector + ARG 2 center + ARG 3 radius + METHOD method_56720 (Lnet/minecraft/class_3218;Lnet/minecraft/class_8962$class_9198;Lnet/minecraft/class_2338;D)Ljava/util/List; + ARG 0 world + ARG 1 selector + ARG 2 center + ARG 3 radius + METHOD method_56721 (Lnet/minecraft/class_2338;DLnet/minecraft/class_1657;)Z + ARG 3 player + METHOD method_56722 (Lnet/minecraft/class_3218;Lnet/minecraft/class_8962$class_9198;Lnet/minecraft/class_2338;D)Ljava/util/List; + ARG 0 world + ARG 1 selector + ARG 2 center + ARG 3 radius + METHOD method_56723 (Lnet/minecraft/class_2338;DLnet/minecraft/class_1657;)Z + ARG 3 player + CLASS class_9198 Selector + FIELD field_48862 IN_WORLD Lnet/minecraft/class_8962$class_9198; + METHOD method_56724 getEntities (Lnet/minecraft/class_3218;Lnet/minecraft/class_5575;Lnet/minecraft/class_238;Ljava/util/function/Predicate;)Ljava/util/List; ARG 1 world - METHOD method_56725 detect (Lnet/minecraft/class_3218;Ljava/util/function/Predicate;)Ljava/util/List; + ARG 2 typeFilter + ARG 3 box + ARG 4 predicate + METHOD method_56725 getPlayers (Lnet/minecraft/class_3218;Ljava/util/function/Predicate;)Ljava/util/List; ARG 1 world - METHOD method_56726 limitPlayer (Lnet/minecraft/class_1657;)Lnet/minecraft/class_8962$class_9198; - METHOD method_56727 limitPlayers (Ljava/util/List;)Lnet/minecraft/class_8962$class_9198; + ARG 2 predicate + METHOD method_56726 ofPlayer (Lnet/minecraft/class_1657;)Lnet/minecraft/class_8962$class_9198; + ARG 0 player + METHOD method_56727 ofPlayers (Ljava/util/List;)Lnet/minecraft/class_8962$class_9198; + ARG 0 players diff --git a/mappings/net/minecraft/block/spawner/TrialSpawnerData.mapping b/mappings/net/minecraft/block/spawner/TrialSpawnerData.mapping index 0517c2d532..e654665cd4 100644 --- a/mappings/net/minecraft/block/spawner/TrialSpawnerData.mapping +++ b/mappings/net/minecraft/block/spawner/TrialSpawnerData.mapping @@ -34,7 +34,10 @@ CLASS net/minecraft/class_8966 net/minecraft/block/spawner/TrialSpawnerData ARG 3 additionalPlayers METHOD method_55186 updatePlayers (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_8962;Lnet/minecraft/class_8962$class_9198;I)V ARG 1 world + ARG 2 pos ARG 3 entityDetector + ARG 4 entitySelector + ARG 5 range METHOD method_55187 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_55188 getSpawnData (Lnet/minecraft/class_8963;Lnet/minecraft/class_5819;)Lnet/minecraft/class_1952; diff --git a/mappings/net/minecraft/block/spawner/TrialSpawnerLogic.mapping b/mappings/net/minecraft/block/spawner/TrialSpawnerLogic.mapping index 90afc7e638..46e5efd1ff 100644 --- a/mappings/net/minecraft/block/spawner/TrialSpawnerLogic.mapping +++ b/mappings/net/minecraft/block/spawner/TrialSpawnerLogic.mapping @@ -6,14 +6,17 @@ CLASS net/minecraft/class_8963 net/minecraft/block/spawner/TrialSpawnerLogic FIELD field_47364 trialSpawner Lnet/minecraft/class_8963$class_8964; FIELD field_47365 entityDetector Lnet/minecraft/class_8962; FIELD field_47366 forceActivate Z + FIELD field_48864 entitySelector Lnet/minecraft/class_8962$class_9198; METHOD (Lnet/minecraft/class_8963$class_8964;Lnet/minecraft/class_8962;Lnet/minecraft/class_8962$class_9198;)V ARG 1 trialSpawner ARG 2 entityDetector + ARG 3 entitySelector METHOD (Lnet/minecraft/class_8965;Lnet/minecraft/class_8966;Lnet/minecraft/class_8963$class_8964;Lnet/minecraft/class_8962;Lnet/minecraft/class_8962$class_9198;)V ARG 1 config ARG 2 data ARG 3 trialSpawner ARG 4 entityDetector + ARG 5 entitySelector METHOD method_55156 codec ()Lcom/mojang/serialization/Codec; METHOD method_55157 (DDDLnet/minecraft/class_5819;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1297; ARG 7 entity @@ -68,6 +71,7 @@ CLASS net/minecraft/class_8963 net/minecraft/block/spawner/TrialSpawnerLogic METHOD method_55176 updateListeners ()V METHOD method_55177 getEntityDetector ()Lnet/minecraft/class_8962; METHOD method_55178 forceActivate ()V + METHOD method_56728 getEntitySelector ()Lnet/minecraft/class_8962$class_9198; CLASS class_8964 TrialSpawner METHOD method_55146 setSpawnerState (Lnet/minecraft/class_1937;Lnet/minecraft/class_8967;)V ARG 1 world diff --git a/mappings/net/minecraft/block/vault/VaultClientData.mapping b/mappings/net/minecraft/block/vault/VaultClientData.mapping new file mode 100644 index 0000000000..298389718c --- /dev/null +++ b/mappings/net/minecraft/block/vault/VaultClientData.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_9202 net/minecraft/block/vault/VaultClientData + FIELD field_48878 DISPLAY_ROTATION_SPEED F + FIELD field_48879 displayRotation F + FIELD field_48880 prevDisplayRotation F + METHOD method_56761 getDisplayRotation ()F + METHOD method_56762 getPreviousDisplayRotation ()F + METHOD method_56763 rotateDisplay ()V diff --git a/mappings/net/minecraft/block/vault/VaultConfig.mapping b/mappings/net/minecraft/block/vault/VaultConfig.mapping new file mode 100644 index 0000000000..319fdd50fb --- /dev/null +++ b/mappings/net/minecraft/block/vault/VaultConfig.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_9203 net/minecraft/block/vault/VaultConfig + FIELD field_48881 CONFIG_KEY Ljava/lang/String; + FIELD field_48882 DEFAULT Lnet/minecraft/class_9203; + FIELD field_48883 codec Lcom/mojang/serialization/Codec; + METHOD (Lnet/minecraft/class_2960;DDLnet/minecraft/class_1799;Ljava/util/Optional;)V + ARG 1 lootTable + ARG 2 activationRange + ARG 4 deactivationRange + ARG 6 keyItem + ARG 7 overrideLootTableToDisplay + METHOD method_56765 validate ()Lcom/mojang/serialization/DataResult; diff --git a/mappings/net/minecraft/block/vault/VaultServerData.mapping b/mappings/net/minecraft/block/vault/VaultServerData.mapping new file mode 100644 index 0000000000..d7ae29ab00 --- /dev/null +++ b/mappings/net/minecraft/block/vault/VaultServerData.mapping @@ -0,0 +1,46 @@ +CLASS net/minecraft/class_9204 net/minecraft/block/vault/VaultServerData + FIELD field_48884 SERVER_DATA_KEY Ljava/lang/String; + FIELD field_48885 codec Lcom/mojang/serialization/Codec; + FIELD field_48886 dirty Z + FIELD field_48887 MAX_STORED_REWARDED_PLAYERS I + FIELD field_48888 rewardedPlayers Ljava/util/Set; + FIELD field_48889 stateUpdatingResumesAt J + FIELD field_48890 itemsToEject Ljava/util/List; + FIELD field_48891 lastFailedUnlockTime J + FIELD field_48892 totalEjectionsNeeded I + METHOD (Ljava/util/Set;JLjava/util/List;I)V + ARG 1 rewardedPlayers + ARG 2 stateUpdatingResumesAt + ARG 4 itemsToEject + ARG 5 totalEjectionsNeeded + METHOD method_56767 getLastFailedUnlockTime ()J + METHOD method_56768 setLastFailedUnlockTime (J)V + ARG 1 lastFailedUnlockTime + METHOD method_56769 hasRewardedPlayer (Lnet/minecraft/class_1657;)Z + ARG 1 player + METHOD method_56770 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_56771 copyFrom (Lnet/minecraft/class_9204;)V + ARG 1 data + METHOD method_56772 setItemsToEject (Ljava/util/List;)V + ARG 1 itemsToEject + METHOD method_56773 getRewardedPlayers ()Ljava/util/Set; + METHOD method_56774 setStateUpdatingResumeTime (J)V + ARG 1 stateUpdatingResumesAt + METHOD method_56775 markPlayerAsRewarded (Lnet/minecraft/class_1657;)V + ARG 1 player + METHOD method_56776 (Lnet/minecraft/class_9204;)Ljava/lang/Integer; + ARG 0 data + METHOD method_56777 getStateUpdatingResumeTime ()J + METHOD method_56778 (Lnet/minecraft/class_9204;)Ljava/util/List; + ARG 0 data + METHOD method_56779 getItemsToEject ()Ljava/util/List; + METHOD method_56780 (Lnet/minecraft/class_9204;)Ljava/lang/Long; + ARG 0 data + METHOD method_56781 finishEjecting ()V + METHOD method_56782 (Lnet/minecraft/class_9204;)Ljava/util/Set; + ARG 0 data + METHOD method_56783 getItemToDisplay ()Lnet/minecraft/class_1799; + METHOD method_56784 getItemToEject ()Lnet/minecraft/class_1799; + METHOD method_56785 getEjectSoundPitchModifier ()F + METHOD method_56786 markDirty ()V diff --git a/mappings/net/minecraft/block/vault/VaultSharedData.mapping b/mappings/net/minecraft/block/vault/VaultSharedData.mapping new file mode 100644 index 0000000000..8350911be9 --- /dev/null +++ b/mappings/net/minecraft/block/vault/VaultSharedData.mapping @@ -0,0 +1,37 @@ +CLASS net/minecraft/class_9205 net/minecraft/block/vault/VaultSharedData + FIELD field_48893 SHARED_DATA_KEY Ljava/lang/String; + FIELD field_48894 codec Lcom/mojang/serialization/Codec; + FIELD field_48895 dirty Z + FIELD field_48896 displayItem Lnet/minecraft/class_1799; + FIELD field_48897 connectedPlayers Ljava/util/Set; + FIELD field_48898 connectedParticlesRange D + METHOD (Lnet/minecraft/class_1799;Ljava/util/Set;D)V + ARG 1 displayItem + ARG 2 connectedPlayers + ARG 3 connectedParticlesRange + METHOD method_56787 getDisplayItem ()Lnet/minecraft/class_1799; + METHOD method_56788 updateConnectedPlayers (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_9204;Lnet/minecraft/class_9203;D)V + ARG 1 world + ARG 2 pos + ARG 3 serverData + ARG 4 config + ARG 5 radius + METHOD method_56789 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_56790 setDisplayItem (Lnet/minecraft/class_1799;)V + ARG 1 stack + METHOD method_56791 (Lnet/minecraft/class_9204;Ljava/util/UUID;)Z + ARG 1 uuid + METHOD method_56792 copyFrom (Lnet/minecraft/class_9205;)V + ARG 1 data + METHOD method_56793 hasDisplayItem ()Z + METHOD method_56794 (Lnet/minecraft/class_9205;)Ljava/lang/Double; + ARG 0 data + METHOD method_56795 hasConnectedPlayers ()Z + METHOD method_56796 (Lnet/minecraft/class_9205;)Ljava/util/Set; + ARG 0 data + METHOD method_56797 getConnectedPlayers ()Ljava/util/Set; + METHOD method_56798 (Lnet/minecraft/class_9205;)Lnet/minecraft/class_1799; + ARG 0 data + METHOD method_56799 getConnectedParticlesRange ()D + METHOD method_56800 markDirty ()V diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 6a57987799..2e47d3f728 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -215,6 +215,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1499 addBlockEntityNbt (Lnet/minecraft/class_1799;Lnet/minecraft/class_2586;Lnet/minecraft/class_5455;)V ARG 1 stack ARG 2 blockEntity + ARG 3 registryManager METHOD method_1502 (Lnet/minecraft/class_1799;)Ljava/util/stream/Stream; ARG 0 stack METHOD method_1504 setCameraEntity (Lnet/minecraft/class_1297;)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping index fee57d27db..0b93248ab9 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.mapping @@ -11,12 +11,14 @@ CLASS net/minecraft/class_3934 net/minecraft/client/gui/screen/ingame/Cartograph ARG 3 title METHOD method_17566 drawMap (Lnet/minecraft/class_332;Lnet/minecraft/class_9209;Lnet/minecraft/class_22;IIF)V ARG 1 context + ARG 2 mapId ARG 3 mapState ARG 4 x ARG 5 y ARG 6 scale METHOD method_17567 drawMap (Lnet/minecraft/class_332;Lnet/minecraft/class_9209;Lnet/minecraft/class_22;ZZZZ)V ARG 1 context + ARG 2 mapId ARG 3 mapState ARG 4 cloneMode ARG 5 expandMode diff --git a/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping index 6d389b98a0..45fce21e31 100644 --- a/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/OptimizeWorldScreen.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_527 net/minecraft/client/gui/screen/world/OptimizeWorl ARG 3 storageSession ARG 4 levelInfo ARG 5 eraseCache + ARG 6 registryManager METHOD method_19938 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_27031 create (Lnet/minecraft/class_310;Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_32$class_5143;Z)Lnet/minecraft/class_527; diff --git a/mappings/net/minecraft/client/option/HotbarStorageEntry.mapping b/mappings/net/minecraft/client/option/HotbarStorageEntry.mapping index 880134a8e3..7bdf956982 100644 --- a/mappings/net/minecraft/client/option/HotbarStorageEntry.mapping +++ b/mappings/net/minecraft/client/option/HotbarStorageEntry.mapping @@ -1 +1,9 @@ CLASS net/minecraft/class_748 net/minecraft/client/option/HotbarStorageEntry + FIELD field_48942 CODEC Lcom/mojang/serialization/Codec; + FIELD field_48943 LOGGER Lorg/slf4j/Logger; + FIELD field_48944 HOTBAR_SIZE I + METHOD method_56836 (Lnet/minecraft/class_1661;Lnet/minecraft/class_5455;)V + ARG 1 playerInventory + ARG 2 registryManager + METHOD method_56839 (Lnet/minecraft/class_7225$class_7874;)Ljava/util/List; + ARG 1 registryLookup diff --git a/mappings/net/minecraft/client/particle/ConnectionParticle.mapping b/mappings/net/minecraft/client/particle/ConnectionParticle.mapping new file mode 100644 index 0000000000..887a75ee36 --- /dev/null +++ b/mappings/net/minecraft/client/particle/ConnectionParticle.mapping @@ -0,0 +1,28 @@ +CLASS net/minecraft/class_668 net/minecraft/client/particle/ConnectionParticle + FIELD field_3793 startZ D + FIELD field_3794 startY D + FIELD field_3795 startX D + FIELD field_48938 fullBrightness Z + FIELD field_48939 dynamicAlpha Lnet/minecraft/class_703$class_9213; + METHOD (Lnet/minecraft/class_638;DDDDDDZLnet/minecraft/class_703$class_9213;)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 velocityX + ARG 10 velocityY + ARG 12 velocityZ + ARG 14 fullBrightness + ARG 15 dynamicAlpha + CLASS class_669 NautilusFactory + FIELD field_17804 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_4002;)V + ARG 1 spriteProvider + CLASS class_670 EnchantFactory + FIELD field_17803 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_4002;)V + ARG 1 spriteProvider + CLASS class_9212 VaultConnectionFactory + FIELD field_48940 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_4002;)V + ARG 1 spriteProvider diff --git a/mappings/net/minecraft/client/particle/EnchantGlyphParticle.mapping b/mappings/net/minecraft/client/particle/EnchantGlyphParticle.mapping deleted file mode 100644 index ea6bc59694..0000000000 --- a/mappings/net/minecraft/client/particle/EnchantGlyphParticle.mapping +++ /dev/null @@ -1,12 +0,0 @@ -CLASS net/minecraft/class_668 net/minecraft/client/particle/EnchantGlyphParticle - FIELD field_3793 startZ D - FIELD field_3794 startY D - FIELD field_3795 startX D - CLASS class_669 NautilusFactory - FIELD field_17804 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider - CLASS class_670 EnchantFactory - FIELD field_17803 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider diff --git a/mappings/net/minecraft/client/particle/Particle.mapping b/mappings/net/minecraft/client/particle/Particle.mapping index 9528f8575a..c2fbd8b6ab 100644 --- a/mappings/net/minecraft/client/particle/Particle.mapping +++ b/mappings/net/minecraft/client/particle/Particle.mapping @@ -155,3 +155,10 @@ CLASS net/minecraft/class_703 net/minecraft/client/particle/Particle COMMENT the new y-velocity of this particle ARG 5 velocityZ COMMENT the new z-velocity of this particle + CLASS class_9213 DynamicAlpha + FIELD field_48941 OPAQUE Lnet/minecraft/class_703$class_9213; + METHOD method_56833 isOpaque ()Z + METHOD method_56834 getAlpha (IIF)F + ARG 1 age + ARG 2 maxAge + ARG 3 tickDelta diff --git a/mappings/net/minecraft/client/particle/ParticleManager.mapping b/mappings/net/minecraft/client/particle/ParticleManager.mapping index 49b88bbbb9..152cc7780c 100644 --- a/mappings/net/minecraft/client/particle/ParticleManager.mapping +++ b/mappings/net/minecraft/client/particle/ParticleManager.mapping @@ -42,6 +42,9 @@ CLASS net/minecraft/class_702 net/minecraft/client/particle/ParticleManager ARG 1 particles COMMENT a collection of particles from the same sheet METHOD method_3049 renderParticles (Lnet/minecraft/class_765;Lnet/minecraft/class_4184;F)V + ARG 1 lightmapTextureManager + ARG 2 camera + ARG 3 tickDelta METHOD method_3051 addEmitter (Lnet/minecraft/class_1297;Lnet/minecraft/class_2394;I)V ARG 1 entity ARG 2 parameters diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping index a49fd71184..d111bd4ba7 100644 --- a/mappings/net/minecraft/client/render/GameRenderer.mapping +++ b/mappings/net/minecraft/client/render/GameRenderer.mapping @@ -98,6 +98,7 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer FIELD field_44813 renderTypeGuiGhostRecipeOverlayProgram Lnet/minecraft/class_5944; FIELD field_47130 ticks I FIELD field_47462 renderTypeBreezeWindProgram Lnet/minecraft/class_5944; + FIELD field_48948 renderTypeCloudsProgram Lnet/minecraft/class_5944; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_759;Lnet/minecraft/class_3300;Lnet/minecraft/class_4599;)V ARG 1 client ARG 2 heldItemRenderer @@ -127,6 +128,8 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer ARG 2 scaledHeight ARG 3 tickDelta METHOD method_3172 renderHand (Lnet/minecraft/class_4184;F)V + ARG 1 camera + ARG 2 tickDelta METHOD method_3174 getNightVisionStrength (Lnet/minecraft/class_1309;F)F ARG 0 entity ARG 1 tickDelta @@ -393,6 +396,7 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer ARG 0 hitResult ARG 1 cameraPos ARG 2 interactionRange + METHOD method_56846 getRenderTypeCloudsProgram ()Lnet/minecraft/class_5944; CLASS 1 METHOD method_45775 (Lnet/minecraft/class_2960;)Z ARG 0 id diff --git a/mappings/net/minecraft/client/render/MapRenderer.mapping b/mappings/net/minecraft/client/render/MapRenderer.mapping index f688d3752c..6fcedc44bc 100644 --- a/mappings/net/minecraft/client/render/MapRenderer.mapping +++ b/mappings/net/minecraft/client/render/MapRenderer.mapping @@ -8,11 +8,13 @@ CLASS net/minecraft/class_330 net/minecraft/client/render/MapRenderer METHOD (Lnet/minecraft/class_1060;)V ARG 1 textureManager METHOD method_1769 updateTexture (Lnet/minecraft/class_9209;Lnet/minecraft/class_22;)V + ARG 1 id ARG 2 state METHOD method_1771 clearStateTextures ()V METHOD method_1773 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_9209;Lnet/minecraft/class_22;ZI)V ARG 1 matrices ARG 2 vertexConsumers + ARG 3 id ARG 4 state ARG 5 hidePlayerIcons ARG 6 light @@ -20,6 +22,7 @@ CLASS net/minecraft/class_330 net/minecraft/client/render/MapRenderer ARG 2 id2 ARG 3 texture METHOD method_32601 getMapTexture (Lnet/minecraft/class_9209;Lnet/minecraft/class_22;)Lnet/minecraft/class_330$class_331; + ARG 1 id ARG 2 state CLASS class_331 MapTexture FIELD field_2046 state Lnet/minecraft/class_22; diff --git a/mappings/net/minecraft/client/render/OverlayVertexConsumer.mapping b/mappings/net/minecraft/client/render/OverlayVertexConsumer.mapping index 1d842d08cd..42a584fa4d 100644 --- a/mappings/net/minecraft/client/render/OverlayVertexConsumer.mapping +++ b/mappings/net/minecraft/client/render/OverlayVertexConsumer.mapping @@ -14,4 +14,6 @@ CLASS net/minecraft/class_4583 net/minecraft/client/render/OverlayVertexConsumer FIELD field_41091 textureScale F METHOD (Lnet/minecraft/class_4588;Lnet/minecraft/class_4587$class_4665;F)V ARG 1 delegate + ARG 2 matrix + ARG 3 textureScale METHOD method_22891 init ()V diff --git a/mappings/net/minecraft/client/render/RenderLayer.mapping b/mappings/net/minecraft/client/render/RenderLayer.mapping index 20e35b0d52..dd741eb13a 100644 --- a/mappings/net/minecraft/client/render/RenderLayer.mapping +++ b/mappings/net/minecraft/client/render/RenderLayer.mapping @@ -47,6 +47,8 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer FIELD field_38345 ENTITY_TRANSLUCENT_EMISSIVE Ljava/util/function/BiFunction; FIELD field_39002 BLOCK_LAYERS Lcom/google/common/collect/ImmutableList; FIELD field_42521 DEBUG_LINE_STRIP Ljava/util/function/Function; + FIELD field_48950 FAST_CLOUDS Lnet/minecraft/class_1921; + FIELD field_48951 FANCY_CLOUDS Lnet/minecraft/class_1921; METHOD (Ljava/lang/String;Lnet/minecraft/class_293;Lnet/minecraft/class_293$class_5596;IZZLjava/lang/Runnable;Ljava/lang/Runnable;)V ARG 1 name ARG 2 vertexFormat @@ -248,6 +250,10 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer ARG 2 y METHOD method_55252 getEntityTranslucentEmissiveNoOutline (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; ARG 0 texture + METHOD method_56848 getClouds (Z)Lnet/minecraft/class_1921$class_4687; + ARG 0 fancy + METHOD method_56849 getFastClouds ()Lnet/minecraft/class_1921; + METHOD method_56850 getFancyClouds ()Lnet/minecraft/class_1921; CLASS class_4687 MultiPhase FIELD field_21403 phases Lnet/minecraft/class_1921$class_4688; FIELD field_21697 affectedOutline Ljava/util/Optional; diff --git a/mappings/net/minecraft/client/render/RenderPhase.mapping b/mappings/net/minecraft/client/render/RenderPhase.mapping index 60f4f4691d..93ee656e4d 100644 --- a/mappings/net/minecraft/client/render/RenderPhase.mapping +++ b/mappings/net/minecraft/client/render/RenderPhase.mapping @@ -97,6 +97,7 @@ CLASS net/minecraft/class_4668 net/minecraft/client/render/RenderPhase FIELD field_44819 GUI_TEXT_HIGHLIGHT_PROGRAM Lnet/minecraft/class_4668$class_5942; FIELD field_44820 GUI_GHOST_RECIPE_OVERLAY_PROGRAM Lnet/minecraft/class_4668$class_5942; FIELD field_47463 BREEZE_WIND_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_48949 CLOUDS_PROGRAM Lnet/minecraft/class_4668$class_5942; METHOD (Ljava/lang/String;Ljava/lang/Runnable;Ljava/lang/Runnable;)V ARG 1 name ARG 2 beginAction diff --git a/mappings/net/minecraft/client/render/VertexConsumer.mapping b/mappings/net/minecraft/client/render/VertexConsumer.mapping index 3a148ac11b..f2db1147d9 100644 --- a/mappings/net/minecraft/client/render/VertexConsumer.mapping +++ b/mappings/net/minecraft/client/render/VertexConsumer.mapping @@ -168,6 +168,7 @@ CLASS net/minecraft/class_4588 net/minecraft/client/render/VertexConsumer COMMENT accepting a normal element. COMMENT COMMENT @return this consumer, for chaining + ARG 1 matrix ARG 2 x ARG 3 y ARG 4 z @@ -209,3 +210,8 @@ CLASS net/minecraft/class_4588 net/minecraft/client/render/VertexConsumer COMMENT COMMENT @return this consumer, for chaining ARG 1 argb + METHOD method_56824 vertex (Lnet/minecraft/class_4587$class_4665;FFF)Lnet/minecraft/class_4588; + ARG 1 matrix + ARG 2 x + ARG 3 y + ARG 4 z diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index ce33bd8419..3e06c8f2b9 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -65,6 +65,9 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer FIELD field_4118 lastTranslucentSortZ D FIELD field_4119 playingSongs Ljava/util/Map; FIELD field_4121 cameraChunkZ I + FIELD field_45614 chunkBuilder Lnet/minecraft/class_846; + FIELD field_45615 chunkRenderingDataPreparer Lnet/minecraft/class_8679; + FIELD field_45616 builtChunks Lit/unimi/dsi/fastutil/objects/ObjectArrayList; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_898;Lnet/minecraft/class_824;Lnet/minecraft/class_4599;)V ARG 1 client ARG 2 entityRenderDispatcher @@ -89,6 +92,12 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 2 old ARG 3 updated METHOD method_22710 render (FJZLnet/minecraft/class_4184;Lnet/minecraft/class_757;Lnet/minecraft/class_765;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V + ARG 1 tickDelta + ARG 2 limitTime + ARG 4 renderBlockOutline + ARG 5 camera + ARG 6 gameRenderer + ARG 7 lightmapTextureManager METHOD method_22712 drawBlockOutline (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_1297;DDDLnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 matrices ARG 2 vertexConsumer @@ -236,6 +245,9 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 1 matrices METHOD method_3251 renderLayer (Lnet/minecraft/class_1921;DDDLorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V ARG 1 renderLayer + ARG 2 x + ARG 4 y + ARG 6 z ARG 9 positionMatrix METHOD method_3252 tick ()V METHOD method_3254 drawEntityOutlinesFramebuffer ()V @@ -261,6 +273,11 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 16 blue ARG 17 alpha METHOD method_3259 renderClouds (Lnet/minecraft/class_4587;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;FDDD)V + ARG 1 matrices + ARG 4 tickDelta + ARG 5 cameraX + ARG 7 cameraY + ARG 9 cameraZ METHOD method_3265 renderDarkSky ()V METHOD method_3267 cleanUp ()V METHOD method_3268 getRandomParticleSpawnChance (Z)Lnet/minecraft/class_4066; diff --git a/mappings/net/minecraft/client/render/block/entity/BeaconBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/BeaconBlockEntityRenderer.mapping index 65e6941250..62bfcba39f 100644 --- a/mappings/net/minecraft/client/render/block/entity/BeaconBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BeaconBlockEntityRenderer.mapping @@ -4,6 +4,22 @@ CLASS net/minecraft/class_822 net/minecraft/client/render/block/entity/BeaconBlo METHOD (Lnet/minecraft/class_5614$class_5615;)V ARG 1 ctx METHOD method_22740 renderBeamFace (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_4588;FFFFIIFFFFFFFF)V + ARG 0 matrix + ARG 1 vertices + ARG 2 red + ARG 3 green + ARG 4 blue + ARG 5 alpha + ARG 6 yOffset + ARG 7 height + ARG 8 x1 + ARG 9 z1 + ARG 10 x2 + ARG 11 z2 + ARG 12 u1 + ARG 13 u2 + ARG 14 v1 + ARG 15 v2 METHOD method_22741 renderBeamLayer (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;FFFFIIFFFFFFFFFFFF)V ARG 0 matrices ARG 1 vertices @@ -26,6 +42,17 @@ CLASS net/minecraft/class_822 net/minecraft/client/render/block/entity/BeaconBlo ARG 18 v1 ARG 19 v2 METHOD method_23076 renderBeamVertex (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_4588;FFFFIFFFF)V + ARG 0 matrix + ARG 1 vertices + ARG 2 red + ARG 3 green + ARG 4 blue + ARG 5 alpha + ARG 6 y + ARG 7 x + ARG 8 z + ARG 9 u + ARG 10 v METHOD method_3543 renderBeam (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;FJII[F)V ARG 0 matrices ARG 1 vertexConsumers diff --git a/mappings/net/minecraft/client/render/block/entity/VaultBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/VaultBlockEntityRenderer.mapping new file mode 100644 index 0000000000..9ea51f55ff --- /dev/null +++ b/mappings/net/minecraft/client/render/block/entity/VaultBlockEntityRenderer.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_9214 net/minecraft/client/render/block/entity/VaultBlockEntityRenderer + FIELD field_48952 itemRenderer Lnet/minecraft/class_918; + FIELD field_48953 random Lnet/minecraft/class_5819; + METHOD (Lnet/minecraft/class_5614$class_5615;)V + ARG 1 context + METHOD method_56851 renderDisplayItem (FLnet/minecraft/class_1937;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1799;Lnet/minecraft/class_918;FFLnet/minecraft/class_5819;)V + ARG 0 tickDelta + ARG 1 world + ARG 2 matrices + ARG 3 vertexConsumers + ARG 4 light + ARG 5 stack + ARG 6 itemRenderer + ARG 7 prevRotation + ARG 8 rotation + ARG 9 random diff --git a/mappings/net/minecraft/client/render/entity/DragonFireballEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/DragonFireballEntityRenderer.mapping index 790defba6d..a2dd1150c9 100644 --- a/mappings/net/minecraft/client/render/entity/DragonFireballEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/DragonFireballEntityRenderer.mapping @@ -3,3 +3,9 @@ CLASS net/minecraft/class_891 net/minecraft/client/render/entity/DragonFireballE FIELD field_4661 TEXTURE Lnet/minecraft/class_2960; METHOD method_23837 produceVertex (Lnet/minecraft/class_4588;Lnet/minecraft/class_4587$class_4665;IFIII)V ARG 0 vertexConsumer + ARG 1 matrix + ARG 2 light + ARG 3 x + ARG 4 z + ARG 5 textureU + ARG 6 textureV diff --git a/mappings/net/minecraft/client/render/entity/ExperienceOrbEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/ExperienceOrbEntityRenderer.mapping index d12a7cff4c..f5864b1117 100644 --- a/mappings/net/minecraft/client/render/entity/ExperienceOrbEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/ExperienceOrbEntityRenderer.mapping @@ -3,3 +3,12 @@ CLASS net/minecraft/class_902 net/minecraft/client/render/entity/ExperienceOrbEn FIELD field_4701 TEXTURE Lnet/minecraft/class_2960; METHOD method_23171 vertex (Lnet/minecraft/class_4588;Lnet/minecraft/class_4587$class_4665;FFIIIFFI)V ARG 0 vertexConsumer + ARG 1 matrix + ARG 2 x + ARG 3 y + ARG 4 red + ARG 5 green + ARG 6 blue + ARG 7 u + ARG 8 v + ARG 9 light diff --git a/mappings/net/minecraft/client/render/entity/FishingBobberEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/FishingBobberEntityRenderer.mapping index 62ebbd16e3..f156cd98f1 100644 --- a/mappings/net/minecraft/client/render/entity/FishingBobberEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/FishingBobberEntityRenderer.mapping @@ -11,6 +11,12 @@ CLASS net/minecraft/class_906 net/minecraft/client/render/entity/FishingBobberEn ARG 6 segmentEnd METHOD method_23840 vertex (Lnet/minecraft/class_4588;Lnet/minecraft/class_4587$class_4665;IFIII)V ARG 0 buffer + ARG 1 matrix + ARG 2 light + ARG 3 x + ARG 4 y + ARG 5 u + ARG 6 v METHOD method_23954 percentage (II)F ARG 0 value ARG 1 max diff --git a/mappings/net/minecraft/client/render/entity/GuardianEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/GuardianEntityRenderer.mapping index 99d112477b..e92420a31e 100644 --- a/mappings/net/minecraft/client/render/entity/GuardianEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/GuardianEntityRenderer.mapping @@ -8,6 +8,15 @@ CLASS net/minecraft/class_907 net/minecraft/client/render/entity/GuardianEntityR ARG 3 layer METHOD method_23173 vertex (Lnet/minecraft/class_4588;Lnet/minecraft/class_4587$class_4665;FFFIIIFF)V ARG 0 vertexConsumer + ARG 1 matrix + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 red + ARG 6 green + ARG 7 blue + ARG 8 u + ARG 9 v METHOD method_3979 fromLerpedPosition (Lnet/minecraft/class_1309;DF)Lnet/minecraft/class_243; ARG 1 entity ARG 2 yOffset diff --git a/mappings/net/minecraft/client/render/entity/ItemEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/ItemEntityRenderer.mapping index af0a2ab5b1..e2532f3deb 100644 --- a/mappings/net/minecraft/client/render/entity/ItemEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/ItemEntityRenderer.mapping @@ -1,3 +1,24 @@ CLASS net/minecraft/class_916 net/minecraft/client/render/entity/ItemEntityRenderer FIELD field_4725 random Lnet/minecraft/class_5819; FIELD field_4726 itemRenderer Lnet/minecraft/class_918; + METHOD method_56855 getRenderedAmount (I)I + ARG 0 stackSize + METHOD method_56856 getSeed (Lnet/minecraft/class_1799;)I + ARG 0 stack + METHOD method_56857 renderStack (Lnet/minecraft/class_918;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1799;Lnet/minecraft/class_5819;Lnet/minecraft/class_1937;)V + ARG 0 itemRenderer + ARG 1 matrices + ARG 2 vertexConsumers + ARG 3 light + ARG 4 stack + ARG 5 random + ARG 6 world + METHOD method_56858 renderStack (Lnet/minecraft/class_918;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1799;Lnet/minecraft/class_1087;ZLnet/minecraft/class_5819;)V + ARG 0 itemRenderer + ARG 1 matrices + ARG 2 vertexConsumers + ARG 3 light + ARG 4 stack + ARG 5 model + ARG 6 depth + ARG 7 random diff --git a/mappings/net/minecraft/client/render/entity/PaintingEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/PaintingEntityRenderer.mapping index f5869a3ace..c44905d4b3 100644 --- a/mappings/net/minecraft/client/render/entity/PaintingEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/PaintingEntityRenderer.mapping @@ -1,5 +1,16 @@ CLASS net/minecraft/class_928 net/minecraft/client/render/entity/PaintingEntityRenderer METHOD method_23188 vertex (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_4588;FFFFFIIII)V + ARG 1 matrix + ARG 2 vertexConsumer + ARG 3 x + ARG 4 y + ARG 5 u + ARG 6 v + ARG 7 z + ARG 8 normalX + ARG 9 normalY + ARG 10 normalZ + ARG 11 light METHOD method_4074 renderPainting (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_1534;IILnet/minecraft/class_1058;Lnet/minecraft/class_1058;)V ARG 1 matrices ARG 2 vertexConsumer diff --git a/mappings/net/minecraft/client/render/entity/ProjectileEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/ProjectileEntityRenderer.mapping index e220f0a4c2..f7dcbc48f3 100644 --- a/mappings/net/minecraft/client/render/entity/ProjectileEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/ProjectileEntityRenderer.mapping @@ -1,2 +1,13 @@ CLASS net/minecraft/class_876 net/minecraft/client/render/entity/ProjectileEntityRenderer METHOD method_23153 vertex (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_4588;IIIFFIIII)V + ARG 1 matrix + ARG 2 vertexConsumer + ARG 3 x + ARG 4 y + ARG 5 z + ARG 6 u + ARG 7 v + ARG 8 normalX + ARG 9 normalZ + ARG 10 normalY + ARG 11 light diff --git a/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping index 66f2820c27..06015ad50d 100644 --- a/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping @@ -12,6 +12,11 @@ CLASS net/minecraft/class_970 net/minecraft/client/render/entity/feature/ArmorFe ARG 1 matrices ARG 2 vertexConsumers ARG 3 light + ARG 4 model + ARG 5 red + ARG 6 green + ARG 7 blue + ARG 8 overlay METHOD method_4169 renderArmor (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_1309;Lnet/minecraft/class_1304;ILnet/minecraft/class_572;)V ARG 1 matrices ARG 2 vertexConsumers @@ -27,6 +32,7 @@ CLASS net/minecraft/class_970 net/minecraft/client/render/entity/feature/ArmorFe METHOD method_4173 usesInnerModel (Lnet/minecraft/class_1304;)Z ARG 1 slot METHOD method_48482 renderTrim (Lnet/minecraft/class_6880;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_8053;Lnet/minecraft/class_572;Z)V + ARG 1 armorMaterial ARG 2 matrices ARG 3 vertexConsumers ARG 4 light diff --git a/mappings/net/minecraft/client/render/entity/feature/StuckStingersFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/StuckStingersFeatureRenderer.mapping index 9b68dd3a04..f0a61db7c5 100644 --- a/mappings/net/minecraft/client/render/entity/feature/StuckStingersFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/StuckStingersFeatureRenderer.mapping @@ -2,3 +2,9 @@ CLASS net/minecraft/class_4506 net/minecraft/client/render/entity/feature/StuckS FIELD field_20529 TEXTURE Lnet/minecraft/class_2960; METHOD method_23295 produceVertex (Lnet/minecraft/class_4588;Lnet/minecraft/class_4587$class_4665;FIFFI)V ARG 0 vertexConsumer + ARG 1 matrix + ARG 2 x + ARG 3 y + ARG 4 u + ARG 5 v + ARG 6 light diff --git a/mappings/net/minecraft/client/util/math/MatrixStack.mapping b/mappings/net/minecraft/client/util/math/MatrixStack.mapping index ab5608e83f..7aeba81bfe 100644 --- a/mappings/net/minecraft/client/util/math/MatrixStack.mapping +++ b/mappings/net/minecraft/client/util/math/MatrixStack.mapping @@ -60,9 +60,13 @@ CLASS net/minecraft/class_4587 net/minecraft/client/util/math/MatrixStack CLASS class_4665 Entry FIELD field_21327 positionMatrix Lorg/joml/Matrix4f; FIELD field_21328 normalMatrix Lorg/joml/Matrix3f; + METHOD (Lnet/minecraft/class_4587$class_4665;)V + ARG 1 matrix METHOD (Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;)V + ARG 1 positionMatrix ARG 2 normalMatrix METHOD method_23761 getPositionMatrix ()Lorg/joml/Matrix4f; COMMENT {@return the matrix used to transform positions} METHOD method_23762 getNormalMatrix ()Lorg/joml/Matrix3f; COMMENT {@return the matrix used to transform normal vectors} + METHOD method_56822 copy ()Lnet/minecraft/class_4587$class_4665; diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index eda21d4775..6c9ee91223 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -152,6 +152,7 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld ARG 11 useDistance ARG 12 seed METHOD method_47437 putClientsideMapState (Lnet/minecraft/class_9209;Lnet/minecraft/class_22;)V + ARG 1 id ARG 2 state METHOD method_53875 addEntity (Lnet/minecraft/class_1297;)V ARG 1 entity diff --git a/mappings/net/minecraft/data/DataProvider.mapping b/mappings/net/minecraft/data/DataProvider.mapping index 91ad0cb909..a72ee1dea1 100644 --- a/mappings/net/minecraft/data/DataProvider.mapping +++ b/mappings/net/minecraft/data/DataProvider.mapping @@ -15,6 +15,10 @@ CLASS net/minecraft/class_2405 net/minecraft/data/DataProvider ARG 0 key METHOD method_53496 writeCodecToPath (Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;Lcom/mojang/serialization/Codec;Ljava/lang/Object;Ljava/nio/file/Path;)Ljava/util/concurrent/CompletableFuture; ARG 0 writer + ARG 1 registryLookup + ARG 2 codec + ARG 3 value + ARG 4 path CLASS class_7857 Factory METHOD create (Lnet/minecraft/class_7784;)Lnet/minecraft/class_2405; ARG 1 output diff --git a/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping b/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping index bf0cf9412c..16d5d6f6b8 100644 --- a/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping +++ b/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping @@ -572,6 +572,7 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato METHOD method_55305 (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_8967;)Lnet/minecraft/class_4935; ARG 3 state METHOD method_55306 registerTrialSpawner ()V + METHOD method_56886 registerVault ()V CLASS class_4911 BuiltinModelPool FIELD field_22835 modelId Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_4910;Lnet/minecraft/class_2960;Lnet/minecraft/class_2248;)V diff --git a/mappings/net/minecraft/data/client/ItemModelGenerator.mapping b/mappings/net/minecraft/data/client/ItemModelGenerator.mapping index 72dbe3480e..5935695d01 100644 --- a/mappings/net/minecraft/data/client/ItemModelGenerator.mapping +++ b/mappings/net/minecraft/data/client/ItemModelGenerator.mapping @@ -30,6 +30,7 @@ CLASS net/minecraft/class_4915 net/minecraft/data/client/ItemModelGenerator METHOD method_48519 createArmorJson (Lnet/minecraft/class_2960;Ljava/util/Map;Lnet/minecraft/class_6880;)Lcom/google/gson/JsonObject; ARG 1 id ARG 2 textures + ARG 3 armorMaterial METHOD method_48522 (Lnet/minecraft/class_1738;Lnet/minecraft/class_2960;Ljava/util/Map;)Lcom/google/gson/JsonObject; ARG 2 id ARG 3 textures @@ -45,3 +46,4 @@ CLASS net/minecraft/class_4915 net/minecraft/data/client/ItemModelGenerator ARG 3 textures CLASS class_8072 TrimMaterial METHOD method_48744 getAppliedName (Lnet/minecraft/class_6880;)Ljava/lang/String; + ARG 1 armorMaterial diff --git a/mappings/net/minecraft/data/client/TextureMap.mapping b/mappings/net/minecraft/data/client/TextureMap.mapping index 082ea880ae..46d1f8e4ee 100644 --- a/mappings/net/minecraft/data/client/TextureMap.mapping +++ b/mappings/net/minecraft/data/client/TextureMap.mapping @@ -162,3 +162,9 @@ CLASS net/minecraft/class_4944 net/minecraft/data/client/TextureMap ARG 0 block ARG 1 side ARG 2 top + METHOD method_56887 vault (Lnet/minecraft/class_2248;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_4944; + ARG 0 block + ARG 1 front + ARG 2 side + ARG 3 top + ARG 4 bottom diff --git a/mappings/net/minecraft/data/server/advancement/AdvancementProvider.mapping b/mappings/net/minecraft/data/server/advancement/AdvancementProvider.mapping index 9d46f24aa4..b274b202e4 100644 --- a/mappings/net/minecraft/data/server/advancement/AdvancementProvider.mapping +++ b/mappings/net/minecraft/data/server/advancement/AdvancementProvider.mapping @@ -6,5 +6,7 @@ CLASS net/minecraft/class_2409 net/minecraft/data/server/advancement/Advancement ARG 1 output ARG 2 registryLookupFuture ARG 3 tabGenerators + METHOD method_10333 (Ljava/util/Set;Ljava/util/List;Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_8779;)V + ARG 5 advancement METHOD method_46809 (Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;)Ljava/util/concurrent/CompletionStage; ARG 2 lookup diff --git a/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping b/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping index bf752d50a2..1793e7aedd 100644 --- a/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping +++ b/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping @@ -3,10 +3,12 @@ CLASS net/minecraft/class_2438 net/minecraft/data/server/loottable/LootTableProv FIELD field_11355 LOGGER Lorg/slf4j/Logger; FIELD field_39374 pathResolver Lnet/minecraft/class_7784$class_7489; FIELD field_40617 lootTableIds Ljava/util/Set; + FIELD field_48978 registryLookupFuture Ljava/util/concurrent/CompletableFuture; METHOD (Lnet/minecraft/class_7784;Ljava/util/Set;Ljava/util/List;Ljava/util/concurrent/CompletableFuture;)V ARG 1 output ARG 2 lootTableIds ARG 3 lootTypeGenerators + ARG 4 registryLookupFuture METHOD method_10407 (Ljava/lang/String;Ljava/lang/String;)V ARG 0 name ARG 1 message @@ -18,4 +20,9 @@ CLASS net/minecraft/class_2438 net/minecraft/data/server/loottable/LootTableProv METHOD method_10412 (Ljava/util/Map;Ljava/util/Map;Lnet/minecraft/class_2438$class_7790;Lnet/minecraft/class_2960;Lnet/minecraft/class_52$class_53;)V ARG 3 id ARG 4 builder + METHOD method_56883 run (Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;)Ljava/util/concurrent/CompletableFuture; + ARG 1 writer + ARG 2 registryLookup + METHOD method_56884 (Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;)Ljava/util/concurrent/CompletionStage; + ARG 2 registryLookup CLASS class_7790 LootTypeGenerator diff --git a/mappings/net/minecraft/data/server/loottable/onetwentyone/OneTwentyOneLootTableProviders.mapping b/mappings/net/minecraft/data/server/loottable/onetwentyone/OneTwentyOneLootTableProviders.mapping index 9ea2245edc..e9009bf89f 100644 --- a/mappings/net/minecraft/data/server/loottable/onetwentyone/OneTwentyOneLootTableProviders.mapping +++ b/mappings/net/minecraft/data/server/loottable/onetwentyone/OneTwentyOneLootTableProviders.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_8903 net/minecraft/data/server/loottable/onetwentyone/OneTwentyOneLootTableProviders METHOD method_54653 createOneTwentyOneProvider (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/class_2438; ARG 0 output + ARG 1 registryLookupFuture diff --git a/mappings/net/minecraft/data/server/loottable/rebalance/TradeRebalanceLootTableProviders.mapping b/mappings/net/minecraft/data/server/loottable/rebalance/TradeRebalanceLootTableProviders.mapping index 05e2a647c8..0945a47d81 100644 --- a/mappings/net/minecraft/data/server/loottable/rebalance/TradeRebalanceLootTableProviders.mapping +++ b/mappings/net/minecraft/data/server/loottable/rebalance/TradeRebalanceLootTableProviders.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_8795 net/minecraft/data/server/loottable/rebalance/TradeRebalanceLootTableProviders METHOD method_53853 createTradeRebalanceProvider (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/class_2438; ARG 0 output + ARG 1 registryLookupFuture diff --git a/mappings/net/minecraft/data/server/loottable/vanilla/VanillaLootTableProviders.mapping b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaLootTableProviders.mapping index e4fa640edb..476c378229 100644 --- a/mappings/net/minecraft/data/server/loottable/vanilla/VanillaLootTableProviders.mapping +++ b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaLootTableProviders.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_7794 net/minecraft/data/server/loottable/vanilla/VanillaLootTableProviders METHOD method_46184 createVanillaProvider (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/class_2438; ARG 0 output + ARG 1 registryLookupFuture diff --git a/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping b/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping index b30d728673..f48ac49a14 100644 --- a/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping +++ b/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping @@ -2,8 +2,10 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/recipe/RecipeProvider FIELD field_28555 VARIANT_FACTORIES Ljava/util/Map; FIELD field_39378 recipesPathResolver Lnet/minecraft/class_7784$class_7489; FIELD field_39379 advancementsPathResolver Lnet/minecraft/class_7784$class_7489; + FIELD field_48981 registryLookupFuture Ljava/util/concurrent/CompletableFuture; METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V ARG 1 output + ARG 2 registryLookupFuture METHOD method_10419 generate (Lnet/minecraft/class_8790;)V ARG 1 exporter METHOD method_10420 conditionsFromTag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_175; @@ -337,6 +339,8 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/recipe/RecipeProvider ARG 2 input METHOD method_46206 saveRecipeAdvancement (Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_8779;)Ljava/util/concurrent/CompletableFuture; ARG 1 cache + ARG 2 registryLookup + ARG 3 advancement METHOD method_46207 generateFamilies (Lnet/minecraft/class_8790;Lnet/minecraft/class_7699;)V ARG 0 exporter ARG 1 enabledFeatures @@ -402,3 +406,8 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/recipe/RecipeProvider ARG 0 exporter ARG 1 output ARG 2 input + METHOD method_56888 run (Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;)Ljava/util/concurrent/CompletableFuture; + ARG 1 writer + ARG 2 registryLookup + METHOD method_56889 (Lnet/minecraft/class_7403;Lnet/minecraft/class_7225$class_7874;)Ljava/util/concurrent/CompletionStage; + ARG 2 registryLookup diff --git a/mappings/net/minecraft/datafixer/fix/HorseArmorFix.mapping b/mappings/net/minecraft/datafixer/fix/HorseArmorFix.mapping index ae92632c75..4c92fda64b 100644 --- a/mappings/net/minecraft/datafixer/fix/HorseArmorFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/HorseArmorFix.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_9183 net/minecraft/datafixer/fix/HorseArmorFix - FIELD field_48805 itemType Ljava/lang/String; + FIELD field_48805 oldNbtKey Ljava/lang/String; METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/lang/String;)V - ARG 2 type - ARG 3 itemType + ARG 1 outputSchema + ARG 2 entityId + ARG 3 oldNbtKey diff --git a/mappings/net/minecraft/datafixer/fix/HorseChestIndexingFix.mapping b/mappings/net/minecraft/datafixer/fix/HorseChestIndexingFix.mapping new file mode 100644 index 0000000000..d768965c34 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/HorseChestIndexingFix.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_9182 net/minecraft/datafixer/fix/HorseChestIndexingFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema + METHOD method_56633 fixIndexing (Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/types/Type;Ljava/lang/String;)Lcom/mojang/datafixers/TypeRewriteRule; + ARG 3 entityId diff --git a/mappings/net/minecraft/datafixer/schema/Schema3808_1.mapping b/mappings/net/minecraft/datafixer/schema/Schema3808_1.mapping new file mode 100644 index 0000000000..44ebcd4d7d --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema3808_1.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_9186 net/minecraft/datafixer/schema/Schema3808_1 diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 0c771c83de..1f14f4edf5 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -1240,6 +1240,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT Sets the custom name of the entity to {@code name} (or {@code null} to COMMENT remove the custom name). ARG 1 name + METHOD method_56673 getRegistryManager ()Lnet/minecraft/class_5455; METHOD method_5668 getRootVehicle ()Lnet/minecraft/class_1297; COMMENT {@return the lowest entity this entity is riding} COMMENT diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index 469e601773..400b4de5fc 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -120,6 +120,11 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 3 boundingBox METHOD method_5888 create (Lnet/minecraft/class_3218;Ljava/util/function/Consumer;Lnet/minecraft/class_2338;Lnet/minecraft/class_3730;ZZ)Lnet/minecraft/class_1297; ARG 1 world + ARG 2 afterConsumer + ARG 3 pos + ARG 4 reason + ARG 5 alignPosition + ARG 6 invertY METHOD method_5890 getId (Lnet/minecraft/class_1299;)Lnet/minecraft/class_2960; ARG 0 type METHOD method_5891 getSpawnGroup ()Lnet/minecraft/class_1311; @@ -144,6 +149,11 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 0 id METHOD method_5899 spawn (Lnet/minecraft/class_3218;Ljava/util/function/Consumer;Lnet/minecraft/class_2338;Lnet/minecraft/class_3730;ZZ)Lnet/minecraft/class_1297; ARG 1 world + ARG 2 afterConsumer + ARG 3 pos + ARG 4 reason + ARG 5 alignPosition + ARG 6 invertY CLASS 1 METHOD method_31490 (Lnet/minecraft/class_1937;Ljava/util/function/Consumer;Lnet/minecraft/class_2520;)V ARG 2 nbt diff --git a/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping b/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping index e051af3a08..e591a3a21c 100644 --- a/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping +++ b/mappings/net/minecraft/entity/EyeOfEnderEntity.mapping @@ -11,6 +11,8 @@ CLASS net/minecraft/class_1672 net/minecraft/entity/EyeOfEnderEntity ARG 4 y ARG 6 z METHOD method_16933 setItem (Lnet/minecraft/class_1799;)V + ARG 1 stack + METHOD method_56684 getItem ()Lnet/minecraft/class_1799; METHOD method_7478 initTargetPos (Lnet/minecraft/class_2338;)V COMMENT Sets where the eye will fly towards. COMMENT If close enough, it will fly directly towards it, otherwise, it will fly upwards, in the direction of the BlockPos. diff --git a/mappings/net/minecraft/entity/ItemEntity.mapping b/mappings/net/minecraft/entity/ItemEntity.mapping index f92bc766f7..536de073bb 100644 --- a/mappings/net/minecraft/entity/ItemEntity.mapping +++ b/mappings/net/minecraft/entity/ItemEntity.mapping @@ -44,6 +44,8 @@ CLASS net/minecraft/class_1542 net/minecraft/entity/ItemEntity ARG 1 stack1 ARG 2 stack2 METHOD method_24017 canMerge (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z + ARG 0 stack1 + ARG 1 stack2 METHOD method_24018 merge (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;I)Lnet/minecraft/class_1799; ARG 0 stack1 ARG 1 stack2 diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index a8e0e03b81..fe1389fa08 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -369,7 +369,11 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_56079 getSlotForHand (Lnet/minecraft/class_1268;)Lnet/minecraft/class_1304; ARG 0 hand METHOD method_5661 getArmorItems ()Ljava/lang/Iterable; + METHOD method_56674 getAllArmorItems ()Ljava/lang/Iterable; + METHOD method_56675 getEquippedItems ()Ljava/lang/Iterable; METHOD method_5673 equipStack (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V + ARG 1 slot + ARG 2 stack METHOD method_5877 getHandItems ()Ljava/lang/Iterable; METHOD method_5973 canTarget (Lnet/minecraft/class_1299;)Z ARG 1 type diff --git a/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping b/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping index 1628ede296..ef15fb12e9 100644 --- a/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping @@ -33,6 +33,7 @@ CLASS net/minecraft/class_1533 net/minecraft/entity/decoration/ItemFrameEntity ARG 1 entity ARG 2 alwaysDrop METHOD method_6937 removeFromFrame (Lnet/minecraft/class_1799;)V + ARG 1 stack METHOD method_6938 getComparatorPower ()I METHOD method_6939 setRotation (I)V ARG 1 value diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping index 01d1be6124..f3d9260c3d 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance COMMENT after short-duration high-amplifier effects run out. FIELD field_42106 INFINITE I FIELD field_47739 fading Lnet/minecraft/class_1293$class_9063; + FIELD field_48821 CODEC Lcom/mojang/serialization/Codec; FIELD field_5889 showIcon Z FIELD field_5890 showParticles Z FIELD field_5892 ambient Z @@ -46,6 +47,9 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance ARG 5 showParticles ARG 6 showIcon ARG 7 hiddenEffect + METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_1293$class_9195;)V + ARG 1 effect + ARG 2 parameters METHOD compareTo (Ljava/lang/Object;)I ARG 1 that METHOD equals (Ljava/lang/Object;)Z @@ -97,6 +101,11 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance ARG 1 that METHOD method_5591 isAmbient ()Z METHOD method_5592 shouldShowIcon ()Z + METHOD method_56666 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_56667 (Lnet/minecraft/class_6880;Lnet/minecraft/class_1293$class_9195;)Lnet/minecraft/class_1293; + ARG 1 parametersx + METHOD method_56668 asParameters ()Lnet/minecraft/class_1293$class_9195; CLASS class_9063 Fading COMMENT Computes the factor (multiplier) for effect fade-in and fade-out. COMMENT @@ -122,3 +131,17 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance ARG 0 effect METHOD method_55663 getFadeTicks (Lnet/minecraft/class_1293;)I ARG 0 effect + CLASS class_9195 Parameters + FIELD field_48822 CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_48823 AMPLIFIER_CODEC Lcom/mojang/serialization/Codec; + METHOD method_56669 create (IIZZLjava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_1293$class_9195; + ARG 0 amplifier + ARG 1 duration + ARG 2 ambient + ARG 3 showParticles + ARG 4 showIcon + ARG 5 hiddenEffect + METHOD method_56670 (Lnet/minecraft/class_1293$class_9195;)Ljava/util/Optional; + ARG 0 parameters + METHOD method_56672 (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 1 instance diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index 6c18a6cd7d..922ca8eb84 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -29,6 +29,8 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity FIELD field_34043 DEFAULT_DROP_CHANCE F FIELD field_38386 ITEM_PICK_UP_RANGE_EXPANDER Lnet/minecraft/class_2382; FIELD field_45969 ATTACK_RANGE D + FIELD field_48828 bodyArmorDropChance F + FIELD field_48829 bodyArmor Lnet/minecraft/class_1799; FIELD field_6184 lootTableSeed J FIELD field_6185 targetSelector Lnet/minecraft/class_1355; COMMENT Contains goals used to select this entity's target. @@ -150,6 +152,10 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity COMMENT @see LivingEntity#getHitbox METHOD method_55695 stopMovement ()V METHOD method_56080 clampHeadYaw ()V + METHOD method_56676 getBodyArmor ()Lnet/minecraft/class_1799; + METHOD method_56677 isWearingBodyArmor ()Z + METHOD method_56678 equipBodyArmor (Lnet/minecraft/class_1799;)V + ARG 1 stack METHOD method_5929 getDropChance (Lnet/minecraft/class_1304;)F ARG 1 slot METHOD method_5930 setForwardSpeed (F)V @@ -274,5 +280,6 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity METHOD method_6510 isAttacking ()Z METHOD method_6735 hasArmorSlot ()Z METHOD method_6773 isHorseArmor (Lnet/minecraft/class_1799;)Z + ARG 1 stack METHOD method_7217 setBaby (Z)V ARG 1 baby diff --git a/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping index d65c27a96c..715f426659 100644 --- a/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_1641 net/minecraft/entity/mob/ZombieVillagerEntity FIELD field_7422 conversionTimer I FIELD field_7423 CONVERTING Lnet/minecraft/class_2940; METHOD method_16916 setOfferData (Lnet/minecraft/class_1916;)V + ARG 1 offerData METHOD method_19622 setXp (I)V ARG 1 xp METHOD method_21649 setGossipData (Lnet/minecraft/class_2520;)V diff --git a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping index 7e5ea42b8b..af724be1d3 100644 --- a/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AbstractHorseEntity.mapping @@ -14,6 +14,7 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity FIELD field_42644 MAX_JUMP_STRENGTH_BONUS F FIELD field_42645 MIN_HEALTH_BONUS F FIELD field_42646 MAX_HEALTH_BONUS F + FIELD field_48830 inventory Lnet/minecraft/class_1263; FIELD field_6955 temper I FIELD field_6956 IS_BRED_HORSE Ljava/util/function/Predicate; FIELD field_6957 tailWagTicks I @@ -72,6 +73,8 @@ CLASS net/minecraft/class_1496 net/minecraft/entity/passive/AbstractHorseEntity ARG 1 controllingPassenger METHOD method_49996 isWooden (Lnet/minecraft/class_2498;)Z ARG 1 soundGroup + METHOD method_56679 updateSaddledFlag ()V + METHOD method_56680 getInventory ()Lnet/minecraft/class_1263; METHOD method_6001 initAttributes (Lnet/minecraft/class_5819;)V ARG 1 random METHOD method_6721 onChestedStatusChanged ()V diff --git a/mappings/net/minecraft/entity/player/PlayerInventory.mapping b/mappings/net/minecraft/entity/player/PlayerInventory.mapping index 5a6bd97025..e52f1be203 100644 --- a/mappings/net/minecraft/entity/player/PlayerInventory.mapping +++ b/mappings/net/minecraft/entity/player/PlayerInventory.mapping @@ -80,6 +80,7 @@ CLASS net/minecraft/class_1661 net/minecraft/entity/player/PlayerInventory ARG 1 nbtList METHOD method_7385 addStack (ILnet/minecraft/class_1799;)I ARG 1 slot + ARG 2 stack METHOD method_7386 getSwappableHotbarSlot ()I METHOD method_7387 populateRecipeFinder (Lnet/minecraft/class_1662;)V ARG 1 finder diff --git a/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping b/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping index 9280417934..737373f090 100644 --- a/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/AbstractFireballEntity.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_3855 net/minecraft/entity/projectile/AbstractFireballEntity FIELD field_17081 ITEM Lnet/minecraft/class_2940; METHOD method_16936 setItem (Lnet/minecraft/class_1799;)V + ARG 1 stack + METHOD method_56685 getItem ()Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/entity/projectile/thrown/ThrownItemEntity.mapping b/mappings/net/minecraft/entity/projectile/thrown/ThrownItemEntity.mapping index d9ffd0451f..96c3854977 100644 --- a/mappings/net/minecraft/entity/projectile/thrown/ThrownItemEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/thrown/ThrownItemEntity.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_3857 net/minecraft/entity/projectile/thrown/ThrownItemEntity FIELD field_17082 ITEM Lnet/minecraft/class_2940; METHOD method_16940 setItem (Lnet/minecraft/class_1799;)V + ARG 1 stack METHOD method_16942 getDefaultItem ()Lnet/minecraft/class_1792; diff --git a/mappings/net/minecraft/inventory/SingleStackInventory.mapping b/mappings/net/minecraft/inventory/SingleStackInventory.mapping index 02203de652..346c1d899b 100644 --- a/mappings/net/minecraft/inventory/SingleStackInventory.mapping +++ b/mappings/net/minecraft/inventory/SingleStackInventory.mapping @@ -6,3 +6,5 @@ CLASS net/minecraft/class_8181 net/minecraft/inventory/SingleStackInventory ARG 1 count METHOD method_54079 getStack ()Lnet/minecraft/class_1799; METHOD method_54099 emptyStack ()Lnet/minecraft/class_1799; + CLASS class_9210 SingleStackBlockEntityInventory + METHOD method_54080 asBlockEntity ()Lnet/minecraft/class_2586; diff --git a/mappings/net/minecraft/item/DyeableItem.mapping b/mappings/net/minecraft/item/DyeableItem.mapping index 28e4f43ad0..7136144b63 100644 --- a/mappings/net/minecraft/item/DyeableItem.mapping +++ b/mappings/net/minecraft/item/DyeableItem.mapping @@ -6,6 +6,11 @@ CLASS net/minecraft/class_1768 net/minecraft/item/DyeableItem ARG 0 stack ARG 1 colors METHOD method_7798 removeColor (Lnet/minecraft/class_1799;)V + ARG 0 stack METHOD method_7799 setColor (Lnet/minecraft/class_1799;I)V + ARG 0 stack + ARG 1 color METHOD method_7800 getColor (Lnet/minecraft/class_1799;)I + ARG 0 stack METHOD method_7801 hasColor (Lnet/minecraft/class_1799;)Z + ARG 0 stack diff --git a/mappings/net/minecraft/item/FilledMapItem.mapping b/mappings/net/minecraft/item/FilledMapItem.mapping index 3500515c03..6cc7322de0 100644 --- a/mappings/net/minecraft/item/FilledMapItem.mapping +++ b/mappings/net/minecraft/item/FilledMapItem.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_1806 net/minecraft/item/FilledMapItem ARG 1 stack METHOD method_32348 setMapId (Lnet/minecraft/class_1799;Lnet/minecraft/class_9209;)V ARG 0 stack + ARG 1 id METHOD method_32349 allocateMapId (Lnet/minecraft/class_1937;IIIZZLnet/minecraft/class_5321;)Lnet/minecraft/class_9209; ARG 0 world ARG 1 x @@ -21,6 +22,7 @@ CLASS net/minecraft/class_1806 net/minecraft/item/FilledMapItem ARG 1 x ARG 2 z METHOD method_53836 getIdText (Lnet/minecraft/class_9209;)Lnet/minecraft/class_2561; + ARG 0 id METHOD method_53837 getIdText (Lnet/minecraft/class_1799;)Lnet/minecraft/class_2561; ARG 0 stack METHOD method_7995 getFluidStateIfVisible (Lnet/minecraft/class_1937;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; @@ -32,6 +34,7 @@ CLASS net/minecraft/class_1806 net/minecraft/item/FilledMapItem ARG 1 world ARG 2 amount METHOD method_7997 getMapState (Lnet/minecraft/class_9209;Lnet/minecraft/class_1937;)Lnet/minecraft/class_22; + ARG 0 id ARG 1 world METHOD method_7998 updateColors (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;Lnet/minecraft/class_22;)V ARG 1 world diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 2051c4935a..66f615ad87 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -200,7 +200,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack ARG 3 clickType ARG 4 player ARG 5 cursorStackReference - METHOD method_31577 canCombine (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z + METHOD method_31577 areItemsAndNbtEqual (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z COMMENT {@return whether the given item stacks' items and NBT are equal} COMMENT COMMENT

If this returns {@code true}, the two item stacks can be combined into one, @@ -239,7 +239,14 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack METHOD method_45435 isItemEnabled (Lnet/minecraft/class_7699;)Z ARG 1 enabledFeatures METHOD method_46651 copyWithCount (I)Lnet/minecraft/class_1799; + COMMENT {@return a copy of this item stack, including the NBT, and {@linkplain #getBobbingAnimationTime bobbing animation time}}, + COMMENT with the item count set to {@code count} + COMMENT + COMMENT @see #copy + COMMENT @see #copyNbtToNewStack + COMMENT @see #copyNbtToNewStackIgnoreEmpty ARG 1 count + COMMENT the item count of the resultant stack METHOD method_51164 copyAndEmpty ()Lnet/minecraft/class_1799; METHOD method_53187 itemMatches (Lnet/minecraft/class_6885;)Z ARG 1 registryEntryList @@ -267,6 +274,32 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT @see #isDamaged COMMENT @see #getDamage COMMENT @see #isDamageable + METHOD method_56700 (Lnet/minecraft/class_1799;)Ljava/util/Optional; + ARG 0 stack + METHOD method_56701 copyNbtToNewStack (Lnet/minecraft/class_1935;I)Lnet/minecraft/class_1799; + COMMENT {@return a new item stack with the NBT copied from this item stack} + COMMENT + COMMENT @see #copy + COMMENT @see #copyWithCount + COMMENT @see #copyNbtToNewStackIgnoreEmpty + ARG 1 item + COMMENT the item of the resultant stack + ARG 2 count + COMMENT the item count of the resultant stack + METHOD method_56702 createOptionalCodec (Ljava/lang/String;)Lcom/mojang/serialization/MapCodec; + ARG 0 fieldName + METHOD method_56703 (Ljava/util/Optional;)Lnet/minecraft/class_1799; + ARG 0 optional + METHOD method_56704 copyNbtToNewStackIgnoreEmpty (Lnet/minecraft/class_1935;I)Lnet/minecraft/class_1799; + COMMENT {@return a new item stack with the NBT copied from this item stack, even if this stack is empty} + COMMENT + COMMENT @see #copy + COMMENT @see #copyWithCount + COMMENT @see #copyNbtToNewStack + ARG 1 item + COMMENT the item of the resultant stack + ARG 2 count + COMMENT the item count of the resultant stack METHOD method_7909 getItem ()Lnet/minecraft/class_1792; COMMENT {@return the item of this stack} COMMENT @@ -557,11 +590,15 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack METHOD method_7972 copy ()Lnet/minecraft/class_1799; COMMENT {@return a copy of this item stack, including the item count, NBT, and COMMENT {@linkplain #getBobbingAnimationTime bobbing animation time}} + COMMENT + COMMENT @see #copyWithCount + COMMENT @see #copyNbtToNewStack + COMMENT @see #copyNbtToNewStackIgnoreEmpty METHOD method_7973 areEqual (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z COMMENT {@return whether the given item stacks are equal, including the item count and NBT} COMMENT COMMENT @see #areItemsEqual - COMMENT @see #canCombine + COMMENT @see #areItemsAndNbtEqual ARG 0 left ARG 1 right METHOD method_7974 setDamage (I)V @@ -615,6 +652,10 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT @see Item Stack NBT Operations ARG 1 key METHOD method_7984 areItemsEqual (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z + COMMENT {@return whether the given item stacks contain the same item, regardless of item count or NBT} + COMMENT + COMMENT @see #areEqual + COMMENT @see #areItemsAndNbtEqual ARG 0 left ARG 1 right METHOD method_7985 hasNbt ()Z diff --git a/mappings/net/minecraft/item/map/MapBannerMarker.mapping b/mappings/net/minecraft/item/map/MapBannerMarker.mapping index 7bfbb1cb43..d3def763a6 100644 --- a/mappings/net/minecraft/item/map/MapBannerMarker.mapping +++ b/mappings/net/minecraft/item/map/MapBannerMarker.mapping @@ -5,6 +5,8 @@ CLASS net/minecraft/class_17 net/minecraft/item/map/MapBannerMarker FIELD comp_2312 pos Lnet/minecraft/class_2338; FIELD comp_2313 color Lnet/minecraft/class_1767; FIELD comp_2314 name Ljava/util/Optional; + FIELD field_48918 CODEC Lcom/mojang/serialization/Codec; + FIELD field_48919 LIST_CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_1767;Ljava/util/Optional;)V ARG 1 pos ARG 2 dyeColor @@ -13,6 +15,8 @@ CLASS net/minecraft/class_17 net/minecraft/item/map/MapBannerMarker METHOD comp_2314 name ()Ljava/util/Optional; METHOD equals (Ljava/lang/Object;)Z ARG 1 o + METHOD method_56812 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD method_71 getKey ()Ljava/lang/String; METHOD method_72 getIconType ()Lnet/minecraft/class_20$class_21; METHOD method_73 fromWorldBlock (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_17; diff --git a/mappings/net/minecraft/item/map/MapIcon.mapping b/mappings/net/minecraft/item/map/MapIcon.mapping index 5bab715fd3..27bd7cc5b8 100644 --- a/mappings/net/minecraft/item/map/MapIcon.mapping +++ b/mappings/net/minecraft/item/map/MapIcon.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_20 net/minecraft/item/map/MapIcon FIELD comp_1844 z B FIELD comp_1845 rotation B FIELD comp_1846 text Ljava/util/Optional; + FIELD field_48920 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_20$class_21;BBBLjava/util/Optional;)V ARG 1 type ARG 2 x @@ -24,10 +25,26 @@ CLASS net/minecraft/class_20 net/minecraft/item/map/MapIcon FIELD field_45788 CODEC Lcom/mojang/serialization/Codec; FIELD field_45789 name Ljava/lang/String; FIELD field_46184 structure Z + FIELD field_48921 INDEX_TO_TYPE Ljava/util/function/IntFunction; + FIELD field_48922 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_48923 index I FIELD field_81 id B FIELD field_82 tintColor I + METHOD (Ljava/lang/String;IILjava/lang/String;ZIZZ)V + ARG 3 index + ARG 4 name + ARG 5 alwaysRender + ARG 6 tintColor + ARG 7 useIconCountLimit + ARG 8 structure + METHOD (Ljava/lang/String;IILjava/lang/String;ZZ)V + ARG 3 index + ARG 4 name + ARG 5 alwaysRender + ARG 6 useIconCountLimit METHOD method_37342 shouldUseIconCountLimit ()Z METHOD method_53841 isStructure ()Z + METHOD method_56813 getIndex ()I METHOD method_95 isAlwaysRendered ()Z METHOD method_96 getTintColor ()I METHOD method_97 hasTintColor ()Z diff --git a/mappings/net/minecraft/item/map/MapId.mapping b/mappings/net/minecraft/item/map/MapId.mapping index ca9888c871..18f73977c5 100644 --- a/mappings/net/minecraft/item/map/MapId.mapping +++ b/mappings/net/minecraft/item/map/MapId.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_9209 net/minecraft/item/map/MapId FIELD field_48924 CODEC Lnet/minecraft/class_9139; + METHOD method_56814 asString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/item/map/MapState.mapping b/mappings/net/minecraft/item/map/MapState.mapping index 8baa80bc33..4b700adc0a 100644 --- a/mappings/net/minecraft/item/map/MapState.mapping +++ b/mappings/net/minecraft/item/map/MapState.mapping @@ -34,6 +34,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState ARG 6 locked ARG 7 dimension METHOD method_100 getPlayerMarkerPacket (Lnet/minecraft/class_9209;Lnet/minecraft/class_1657;)Lnet/minecraft/class_2596; + ARG 1 mapId ARG 2 player METHOD method_101 getPlayerSyncData (Lnet/minecraft/class_1657;)Lnet/minecraft/class_22$class_23; ARG 1 player @@ -109,6 +110,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState ARG 3 color METHOD method_32371 fromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_22; ARG 0 nbt + ARG 1 registryLookup METHOD method_32372 hasMonumentIcon ()Z METHOD method_32373 getIcons ()Ljava/lang/Iterable; METHOD method_32374 markIconsDirty ()V @@ -135,6 +137,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState ARG 1 startX ARG 2 startZ METHOD method_112 getPacket (Lnet/minecraft/class_9209;)Lnet/minecraft/class_2596; + ARG 1 mapId METHOD method_32375 getMapUpdateData ()Lnet/minecraft/class_22$class_5637; METHOD method_32379 markIconsDirty ()V CLASS class_5637 UpdateData @@ -143,6 +146,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState FIELD comp_2318 width I FIELD comp_2319 height I FIELD comp_2320 colors [B + FIELD field_48925 CODEC Lnet/minecraft/class_9139; METHOD (IIII[B)V ARG 1 startX ARG 2 startZ @@ -156,3 +160,8 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState METHOD comp_2320 colors ()[B METHOD method_32380 setColorsTo (Lnet/minecraft/class_22;)V ARG 1 mapState + METHOD method_56816 decode (Lio/netty/buffer/ByteBuf;)Ljava/util/Optional; + ARG 0 buf + METHOD method_56817 encode (Lio/netty/buffer/ByteBuf;Ljava/util/Optional;)V + ARG 0 buf + ARG 1 updateData diff --git a/mappings/net/minecraft/item/trim/ArmorTrim.mapping b/mappings/net/minecraft/item/trim/ArmorTrim.mapping index c584a82b7e..42fd967746 100644 --- a/mappings/net/minecraft/item/trim/ArmorTrim.mapping +++ b/mappings/net/minecraft/item/trim/ArmorTrim.mapping @@ -33,10 +33,17 @@ CLASS net/minecraft/class_8053 net/minecraft/item/trim/ArmorTrim METHOD method_48430 (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; ARG 1 path METHOD method_48431 getMaterial ()Lnet/minecraft/class_6880; + METHOD method_48432 (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;)Lnet/minecraft/class_2960; + ARG 2 armorMaterial METHOD method_48433 (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; ARG 1 path METHOD method_48434 getLeggingsModelId (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2960; + ARG 1 armorMaterial + METHOD method_48435 (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;)Lnet/minecraft/class_2960; + ARG 2 armorMaterial METHOD method_48436 getGenericModelId (Lnet/minecraft/class_6880;)Lnet/minecraft/class_2960; + ARG 1 armorMaterial METHOD method_48577 getMaterialAssetNameFor (Lnet/minecraft/class_6880;)Ljava/lang/String; + ARG 1 armorMaterial METHOD method_52565 (ZLjava/lang/String;)V ARG 1 error diff --git a/mappings/net/minecraft/loot/LootDataType.mapping b/mappings/net/minecraft/loot/LootDataType.mapping index a286aa3aab..4da37efee6 100644 --- a/mappings/net/minecraft/loot/LootDataType.mapping +++ b/mappings/net/minecraft/loot/LootDataType.mapping @@ -9,6 +9,8 @@ CLASS net/minecraft/class_8490 net/minecraft/loot/LootDataType ARG 3 validator METHOD method_51204 parse (Lnet/minecraft/class_2960;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Ljava/util/Optional; ARG 1 id + ARG 2 ops + ARG 3 json METHOD method_51207 (Lnet/minecraft/class_58;Lnet/minecraft/class_8488;Lnet/minecraft/class_46;)V ARG 0 reporter ARG 1 key diff --git a/mappings/net/minecraft/loot/LootManager.mapping b/mappings/net/minecraft/loot/LootManager.mapping index 99167bf6d6..2d9133f763 100644 --- a/mappings/net/minecraft/loot/LootManager.mapping +++ b/mappings/net/minecraft/loot/LootManager.mapping @@ -3,9 +3,14 @@ CLASS net/minecraft/class_60 net/minecraft/loot/LootManager FIELD field_44492 keyToValue Ljava/util/Map; FIELD field_44493 typeToIds Lcom/google/common/collect/Multimap; FIELD field_45793 GSON Lcom/google/gson/Gson; + FIELD field_48927 registryLookup Lnet/minecraft/class_7225$class_7874; FIELD field_975 LOGGER Lorg/slf4j/Logger; + METHOD (Lnet/minecraft/class_7225$class_7874;)V + ARG 1 registryLookup METHOD method_20712 validate (Ljava/util/Map;)V ARG 1 lootData + METHOD method_51190 (Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;Ljava/util/Map;Lnet/minecraft/class_8490;)Ljava/util/concurrent/CompletableFuture; + ARG 4 type METHOD method_51191 (Lcom/google/common/collect/ImmutableMap$Builder;Lcom/google/common/collect/ImmutableMultimap$Builder;Lnet/minecraft/class_8490;Ljava/util/Map;)V ARG 2 type ARG 3 idToValue @@ -16,6 +21,12 @@ CLASS net/minecraft/class_60 net/minecraft/loot/LootManager ARG 1 type METHOD method_51194 load (Lnet/minecraft/class_8490;Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;Ljava/util/Map;)Ljava/util/concurrent/CompletableFuture; ARG 0 type + ARG 1 registryLookup + ARG 2 resourceManager + ARG 3 executor + METHOD method_51195 (Lnet/minecraft/class_8490;Lnet/minecraft/class_6903;Ljava/util/Map;Lnet/minecraft/class_2960;Lcom/google/gson/JsonElement;)V + ARG 3 id + ARG 4 json METHOD method_51196 validate (Lnet/minecraft/class_58;Lnet/minecraft/class_8488;Ljava/lang/Object;)V ARG 0 reporter ARG 1 key diff --git a/mappings/net/minecraft/network/PacketByteBuf.mapping b/mappings/net/minecraft/network/PacketByteBuf.mapping index 5679482972..3f405476de 100644 --- a/mappings/net/minecraft/network/PacketByteBuf.mapping +++ b/mappings/net/minecraft/network/PacketByteBuf.mapping @@ -846,6 +846,7 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT the value is not null. COMMENT COMMENT @see #readNullable(PacketByteBuf.PacketReader) + ARG 1 value ARG 2 writer METHOD method_43827 readNullable (Lnet/minecraft/class_9141;)Ljava/lang/Object; COMMENT Reads a nullable value from this buf. A nullable value is represented by @@ -1073,6 +1074,21 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf ARG 0 buf METHOD method_56345 readNbt (Lio/netty/buffer/ByteBuf;)Lnet/minecraft/class_2487; ARG 0 buf + METHOD method_56890 readByteArray (Lio/netty/buffer/ByteBuf;)[B + ARG 0 buf + METHOD method_56891 readByteArray (Lio/netty/buffer/ByteBuf;I)[B + ARG 0 buf + ARG 1 maxSize + METHOD method_56892 writeNullable (Lio/netty/buffer/ByteBuf;Ljava/lang/Object;Lnet/minecraft/class_9142;)V + ARG 0 buf + ARG 1 value + ARG 2 writer + METHOD method_56893 readNullable (Lio/netty/buffer/ByteBuf;Lnet/minecraft/class_9141;)Ljava/lang/Object; + ARG 0 buf + ARG 1 reader + METHOD method_56894 writeByteArray (Lio/netty/buffer/ByteBuf;[B)V + ARG 0 buf + ARG 1 array METHOD nioBuffer (II)Ljava/nio/ByteBuffer; ARG 1 index ARG 2 length diff --git a/mappings/net/minecraft/network/codec/PacketCodec.mapping b/mappings/net/minecraft/network/codec/PacketCodec.mapping index d227d0ed66..23e28f635a 100644 --- a/mappings/net/minecraft/network/codec/PacketCodec.mapping +++ b/mappings/net/minecraft/network/codec/PacketCodec.mapping @@ -126,6 +126,30 @@ CLASS net/minecraft/class_9139 net/minecraft/network/codec/PacketCodec COMMENT a function that, given a value, returns its "type" ARG 2 codec COMMENT a function that, given a "type", returns the codec for encoding/decoding the value + METHOD method_56905 tuple (Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function4;)Lnet/minecraft/class_9139; + COMMENT {@return a codec for encoding four values} + ARG 0 codec1 + ARG 1 from1 + ARG 2 codec2 + ARG 3 from2 + ARG 4 codec3 + ARG 5 from3 + ARG 6 codec4 + ARG 7 from4 + ARG 8 to + METHOD method_56906 tuple (Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function5;)Lnet/minecraft/class_9139; + COMMENT {@return a codec for encoding five values} + ARG 0 codec1 + ARG 1 from1 + ARG 2 codec2 + ARG 3 from2 + ARG 4 codec3 + ARG 5 from3 + ARG 6 codec4 + ARG 7 from4 + ARG 8 codec5 + ARG 9 from5 + ARG 10 to CLASS class_9140 ResultFunction METHOD apply (Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139; ARG 1 codec diff --git a/mappings/net/minecraft/network/codec/PacketCodecs.mapping b/mappings/net/minecraft/network/codec/PacketCodecs.mapping index eb167eb5e2..51db7a421c 100644 --- a/mappings/net/minecraft/network/codec/PacketCodecs.mapping +++ b/mappings/net/minecraft/network/codec/PacketCodecs.mapping @@ -215,6 +215,10 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs ARG 1 codec METHOD method_56385 (Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139; ARG 0 codec + METHOD method_56895 byteArray (I)Lnet/minecraft/class_9139; + ARG 0 maxLength + METHOD method_56896 registryCodec (Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_9139; + ARG 0 codec CLASS 10 METHOD method_56419 (Lnet/minecraft/class_9139;Lio/netty/buffer/ByteBuf;Lnet/minecraft/class_9139;Ljava/lang/Object;Ljava/lang/Object;)V ARG 3 k @@ -226,3 +230,9 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs FIELD field_48562 DIRECT_ENTRY_MARKER I METHOD method_56390 getEntries (Lnet/minecraft/class_9129;)Lnet/minecraft/class_2359; ARG 1 buf + CLASS 21 + METHOD method_56403 decode (Lio/netty/buffer/ByteBuf;)[B + ARG 1 buf + METHOD method_56404 encode (Lio/netty/buffer/ByteBuf;[B)V + ARG 1 buf + ARG 2 value diff --git a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping index 92f250705f..1c9e64df34 100644 --- a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping @@ -216,3 +216,4 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi METHOD method_55450 onScoreboardScoreReset (Lnet/minecraft/class_9006;)V ARG 1 packet METHOD method_56607 onDebugSample (Lnet/minecraft/class_9178;)V + ARG 1 packet diff --git a/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping index 0e7f2106fd..8e0452e812 100644 --- a/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping @@ -92,4 +92,5 @@ CLASS net/minecraft/class_2792 net/minecraft/network/listener/ServerPlayPacketLi ARG 1 packet METHOD method_54436 onSlotChangedState (Lnet/minecraft/class_8875;)V ARG 1 packet - METHOD method_56619 onDebugSampleSubscription (Lnet/minecraft/class_9179;)V + METHOD method_56619 onDebugSampleSubcription (Lnet/minecraft/class_9179;)V + ARG 1 packet diff --git a/mappings/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.mapping index e6fda73720..396c6a9959 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.mapping @@ -1,11 +1,5 @@ CLASS net/minecraft/class_2820 net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket - FIELD comp_2285 slot I - FIELD comp_2286 pages Ljava/util/List; - FIELD comp_2287 title Ljava/util/Optional; FIELD field_34039 MAX_TITLE_LENGTH I FIELD field_34040 MAX_PAGE_LENGTH I FIELD field_34046 MAX_PAGES I FIELD field_48193 CODEC Lnet/minecraft/class_9139; - METHOD comp_2285 slot ()I - METHOD comp_2286 pages ()Ljava/util/List; - METHOD comp_2287 title ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/network/packet/c2s/play/DebugSampleSubscriptionC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/DebugSampleSubscriptionC2SPacket.mapping new file mode 100644 index 0000000000..214ed689a1 --- /dev/null +++ b/mappings/net/minecraft/network/packet/c2s/play/DebugSampleSubscriptionC2SPacket.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_9179 net/minecraft/network/packet/c2s/play/DebugSampleSubscriptionC2SPacket + FIELD field_48784 CODEC Lnet/minecraft/class_9139; + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_56621 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/common/DisconnectS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/DisconnectS2CPacket.mapping index 8f2f0a84a8..703a6cf9b0 100644 --- a/mappings/net/minecraft/network/packet/s2c/common/DisconnectS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/common/DisconnectS2CPacket.mapping @@ -1,4 +1,2 @@ CLASS net/minecraft/class_2661 net/minecraft/network/packet/s2c/common/DisconnectS2CPacket - FIELD comp_2325 reason Lnet/minecraft/class_2561; FIELD field_48622 CODEC Lnet/minecraft/class_9139; - METHOD comp_2325 reason ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping index fc34c4d1f3..e70a5c5ff8 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/BlockEntityUpdateS2CPacket.mapping @@ -14,3 +14,4 @@ CLASS net/minecraft/class_2622 net/minecraft/network/packet/s2c/play/BlockEntity ARG 0 blockEntity METHOD method_39026 create (Lnet/minecraft/class_2586;Ljava/util/function/BiFunction;)Lnet/minecraft/class_2622; ARG 0 blockEntity + ARG 1 nbtGetter diff --git a/mappings/net/minecraft/network/packet/s2c/play/BossBarS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/BossBarS2CPacket.mapping index 2c8ec63794..294229efec 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/BossBarS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/BossBarS2CPacket.mapping @@ -9,6 +9,8 @@ CLASS net/minecraft/class_2629 net/minecraft/network/packet/s2c/play/BossBarS2CP METHOD (Ljava/util/UUID;Lnet/minecraft/class_2629$class_5882;)V ARG 1 uuid ARG 2 action + METHOD (Lnet/minecraft/class_9129;)V + ARG 1 buf METHOD method_34089 add (Lnet/minecraft/class_1259;)Lnet/minecraft/class_2629; ARG 0 bar METHOD method_34090 remove (Ljava/util/UUID;)Lnet/minecraft/class_2629; @@ -28,6 +30,7 @@ CLASS net/minecraft/class_2629 net/minecraft/network/packet/s2c/play/BossBarS2CP METHOD method_34098 updateProperties (Lnet/minecraft/class_1259;)Lnet/minecraft/class_2629; ARG 0 bar METHOD method_55861 write (Lnet/minecraft/class_9129;)V + ARG 1 buf CLASS class_5880 AddAction FIELD field_29100 name Lnet/minecraft/class_2561; FIELD field_29101 percent F @@ -38,6 +41,8 @@ CLASS net/minecraft/class_2629 net/minecraft/network/packet/s2c/play/BossBarS2CP FIELD field_29106 thickenFog Z METHOD (Lnet/minecraft/class_1259;)V ARG 1 bar + METHOD (Lnet/minecraft/class_9129;)V + ARG 1 buf CLASS class_5881 Consumer METHOD method_34099 remove (Ljava/util/UUID;)V ARG 1 uuid @@ -71,22 +76,29 @@ CLASS net/minecraft/class_2629 net/minecraft/network/packet/s2c/play/BossBarS2CP ARG 1 uuid ARG 2 consumer METHOD method_34107 toPacket (Lnet/minecraft/class_9129;)V + ARG 1 buf CLASS class_5883 Type FIELD field_29113 parser Lnet/minecraft/class_9141; + METHOD (Ljava/lang/String;ILnet/minecraft/class_9141;)V + ARG 3 parser + METHOD method_34113 (Lnet/minecraft/class_9129;)Lnet/minecraft/class_2629$class_5882; + ARG 0 buf CLASS class_5884 UpdateNameAction - FIELD comp_2260 name Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_2561;)V ARG 1 name - METHOD comp_2260 name ()Lnet/minecraft/class_2561; + METHOD (Lnet/minecraft/class_9129;)V + ARG 1 buf CLASS class_5885 UpdateProgressAction - FIELD comp_2261 percent F METHOD (F)V ARG 1 percent - METHOD comp_2261 percent ()F + METHOD (Lnet/minecraft/class_9129;)V + ARG 1 buf CLASS class_5886 UpdatePropertiesAction FIELD field_29117 darkenSky Z FIELD field_29118 dragonMusic Z FIELD field_29119 thickenFog Z + METHOD (Lnet/minecraft/class_9129;)V + ARG 1 buf METHOD (ZZZ)V ARG 1 darkenSky ARG 2 dragonMusic @@ -97,3 +109,5 @@ CLASS net/minecraft/class_2629 net/minecraft/network/packet/s2c/play/BossBarS2CP METHOD (Lnet/minecraft/class_1259$class_1260;Lnet/minecraft/class_1259$class_1261;)V ARG 1 color ARG 2 style + METHOD (Lnet/minecraft/class_9129;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping index 4a0f077724..12080463b0 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_2639 net/minecraft/network/packet/s2c/play/CommandSuggestionsS2CPacket - FIELD comp_2262 completionId I - FIELD comp_2265 suggestions Ljava/util/List; FIELD field_47913 CODEC Lnet/minecraft/class_9139; METHOD (ILcom/mojang/brigadier/suggestion/Suggestions;)V ARG 1 completionId ARG 2 suggestions - METHOD comp_2262 completionId ()I - METHOD comp_2265 suggestions ()Ljava/util/List; METHOD method_11397 getSuggestions ()Lcom/mojang/brigadier/suggestion/Suggestions; + METHOD method_56609 (Lcom/mojang/brigadier/suggestion/Suggestion;)Lnet/minecraft/class_2639$class_9177; + ARG 0 suggestion + CLASS class_9177 Suggestion + FIELD field_48779 CODEC Lnet/minecraft/class_9139; diff --git a/mappings/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.mapping index 137bafd85c..7803da8b58 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket.mapping @@ -1,6 +1,2 @@ CLASS net/minecraft/class_5892 net/minecraft/network/packet/s2c/play/DeathMessageS2CPacket - FIELD comp_2275 entityId I - FIELD comp_2276 message Lnet/minecraft/class_2561; FIELD field_47953 CODEC Lnet/minecraft/class_9139; - METHOD comp_2275 entityId ()I - METHOD comp_2276 message ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/network/packet/s2c/play/LightData.mapping b/mappings/net/minecraft/network/packet/s2c/play/LightData.mapping index 3290bfc457..df5675b05f 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/LightData.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/LightData.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_6606 net/minecraft/network/packet/s2c/play/LightData FIELD field_34876 uninitedBlock Ljava/util/BitSet; FIELD field_34877 skyNibbles Ljava/util/List; FIELD field_34878 blockNibbles Ljava/util/List; + FIELD field_48781 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_1923;Lnet/minecraft/class_3568;Ljava/util/BitSet;Ljava/util/BitSet;)V ARG 1 pos ARG 2 lightProvider diff --git a/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping index 8310d25f07..6b9b80b365 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket.mapping @@ -1,18 +1,13 @@ CLASS net/minecraft/class_2683 net/minecraft/network/packet/s2c/play/MapUpdateS2CPacket - FIELD comp_2270 id Lnet/minecraft/class_9209; - FIELD comp_2271 scale B - FIELD comp_2272 locked Z FIELD comp_2273 icons Ljava/util/Optional; FIELD comp_2274 updateData Ljava/util/Optional; FIELD field_47938 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_9209;BZLjava/util/Collection;Lnet/minecraft/class_22$class_5637;)V + ARG 1 mapId ARG 2 scale ARG 3 locked ARG 4 icons ARG 5 updateData - METHOD comp_2270 id ()Lnet/minecraft/class_9209; - METHOD comp_2271 scale ()B - METHOD comp_2272 locked ()Z METHOD comp_2273 icons ()Ljava/util/Optional; METHOD comp_2274 updateData ()Ljava/util/Optional; METHOD method_11642 apply (Lnet/minecraft/class_22;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/OverlayMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/OverlayMessageS2CPacket.mapping index 1a2ce21607..6b8ee0b79b 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/OverlayMessageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/OverlayMessageS2CPacket.mapping @@ -1,4 +1,2 @@ CLASS net/minecraft/class_5894 net/minecraft/network/packet/s2c/play/OverlayMessageS2CPacket - FIELD comp_2279 message Lnet/minecraft/class_2561; FIELD field_47967 CODEC Lnet/minecraft/class_9139; - METHOD comp_2279 message ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerListHeaderS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerListHeaderS2CPacket.mapping index 62bab7a779..d85246331a 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerListHeaderS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerListHeaderS2CPacket.mapping @@ -1,6 +1,2 @@ CLASS net/minecraft/class_2772 net/minecraft/network/packet/s2c/play/PlayerListHeaderS2CPacket - FIELD comp_2282 header Lnet/minecraft/class_2561; - FIELD comp_2283 footer Lnet/minecraft/class_2561; FIELD field_48001 CODEC Lnet/minecraft/class_9139; - METHOD comp_2282 header ()Lnet/minecraft/class_2561; - METHOD comp_2283 footer ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping index f697fc387a..3bd36772d5 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerListS2CPacket.mapping @@ -8,6 +8,8 @@ CLASS net/minecraft/class_2703 net/minecraft/network/packet/s2c/play/PlayerListS METHOD (Lnet/minecraft/class_2703$class_5893;Lnet/minecraft/class_3222;)V ARG 1 action ARG 2 player + METHOD (Lnet/minecraft/class_9129;)V + ARG 1 buf METHOD method_43886 entryFromPlayer (Ljava/util/Collection;)Lnet/minecraft/class_2703; ARG 0 players METHOD method_46326 (Lnet/minecraft/class_2540;Lnet/minecraft/class_2703$class_2705;)V @@ -19,6 +21,7 @@ CLASS net/minecraft/class_2703 net/minecraft/network/packet/s2c/play/PlayerListS METHOD method_46329 getEntries ()Ljava/util/List; METHOD method_46330 getPlayerAdditionEntries ()Ljava/util/List; METHOD method_55902 write (Lnet/minecraft/class_9129;)V + ARG 1 buf CLASS class_2705 Entry FIELD comp_1107 profile Lcom/mojang/authlib/GameProfile; FIELD comp_1109 latency I @@ -37,34 +40,48 @@ CLASS net/minecraft/class_2703 net/minecraft/network/packet/s2c/play/PlayerListS ARG 3 reader ARG 4 writer METHOD method_46331 (Lnet/minecraft/class_9129;Lnet/minecraft/class_2703$class_2705;)V + ARG 0 buf ARG 1 entry METHOD method_46332 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_9129;)V ARG 0 serialized + ARG 1 buf METHOD method_46333 (Lnet/minecraft/class_9129;Lnet/minecraft/class_2703$class_2705;)V + ARG 0 buf ARG 1 entry METHOD method_46334 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_9129;)V ARG 0 serialized + ARG 1 buf METHOD method_46335 (Lnet/minecraft/class_9129;Lnet/minecraft/class_2703$class_2705;)V + ARG 0 buf ARG 1 entry METHOD method_46336 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_9129;)V ARG 0 serialized + ARG 1 buf METHOD method_46337 (Lnet/minecraft/class_9129;Lnet/minecraft/class_2703$class_2705;)V + ARG 0 buf ARG 1 entry METHOD method_46338 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_9129;)V ARG 0 serialized + ARG 1 buf METHOD method_46339 (Lnet/minecraft/class_9129;Lnet/minecraft/class_2703$class_2705;)V + ARG 0 buf ARG 1 entry METHOD method_46340 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_9129;)V ARG 0 serialized + ARG 1 buf METHOD method_46341 (Lnet/minecraft/class_9129;Lnet/minecraft/class_2703$class_2705;)V + ARG 0 buf ARG 1 entry METHOD method_46342 (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_9129;)V ARG 0 serialized + ARG 1 buf CLASS class_7829 Reader METHOD read (Lnet/minecraft/class_2703$class_7831;Lnet/minecraft/class_9129;)V ARG 1 serialized + ARG 2 buf CLASS class_7830 Writer METHOD write (Lnet/minecraft/class_9129;Lnet/minecraft/class_2703$class_2705;)V + ARG 1 buf ARG 2 entry CLASS class_7831 Serialized FIELD field_40703 profileId Ljava/util/UUID; diff --git a/mappings/net/minecraft/network/packet/s2c/play/SubtitleS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SubtitleS2CPacket.mapping index 9b14cc70c5..e3a9169ec5 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/SubtitleS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/SubtitleS2CPacket.mapping @@ -1,4 +1,2 @@ CLASS net/minecraft/class_5903 net/minecraft/network/packet/s2c/play/SubtitleS2CPacket - FIELD comp_2280 subtitle Lnet/minecraft/class_2561; FIELD field_47990 CODEC Lnet/minecraft/class_9139; - METHOD comp_2280 subtitle ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/network/packet/s2c/play/TeamS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/TeamS2CPacket.mapping index 9eca517f43..21914bc06a 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/TeamS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/TeamS2CPacket.mapping @@ -28,6 +28,8 @@ CLASS net/minecraft/class_5900 net/minecraft/network/packet/s2c/play/TeamS2CPack ARG 2 packetType ARG 3 team ARG 4 playerNames + METHOD (Lnet/minecraft/class_9129;)V + ARG 1 buf METHOD method_34169 containsPlayers (I)Z ARG 0 packetType METHOD method_34170 updateRemovedTeam (Lnet/minecraft/class_268;)Lnet/minecraft/class_5900; @@ -47,6 +49,7 @@ CLASS net/minecraft/class_5900 net/minecraft/network/packet/s2c/play/TeamS2CPack METHOD method_34178 getPlayerNames ()Ljava/util/Collection; METHOD method_34179 getTeam ()Ljava/util/Optional; METHOD method_55934 write (Lnet/minecraft/class_9129;)V + ARG 1 buf CLASS class_5901 Operation CLASS class_5902 SerializableTeam FIELD field_29158 displayName Lnet/minecraft/class_2561; @@ -58,8 +61,11 @@ CLASS net/minecraft/class_5900 net/minecraft/network/packet/s2c/play/TeamS2CPack FIELD field_29164 friendlyFlags I METHOD (Lnet/minecraft/class_268;)V ARG 1 team + METHOD (Lnet/minecraft/class_9129;)V + ARG 1 buf METHOD method_34181 getDisplayName ()Lnet/minecraft/class_2561; METHOD method_34182 write (Lnet/minecraft/class_9129;)V + ARG 1 buf METHOD method_34183 getFriendlyFlagsBitwise ()I METHOD method_34184 getColor ()Lnet/minecraft/class_124; METHOD method_34185 getNameTagVisibilityRule ()Ljava/lang/String; diff --git a/mappings/net/minecraft/network/packet/s2c/play/TitleS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/TitleS2CPacket.mapping index d9660ec517..fc6b3d5bc0 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/TitleS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/TitleS2CPacket.mapping @@ -1,4 +1,2 @@ CLASS net/minecraft/class_5904 net/minecraft/network/packet/s2c/play/TitleS2CPacket - FIELD comp_2281 title Lnet/minecraft/class_2561; FIELD field_47992 CODEC Lnet/minecraft/class_9139; - METHOD comp_2281 title ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/particle/ParticleEffect.mapping b/mappings/net/minecraft/particle/ParticleEffect.mapping index 55c4c09142..ebb067be9d 100644 --- a/mappings/net/minecraft/particle/ParticleEffect.mapping +++ b/mappings/net/minecraft/particle/ParticleEffect.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_2394 net/minecraft/particle/ParticleEffect METHOD method_10293 asString (Lnet/minecraft/class_7225$class_7874;)Ljava/lang/String; + ARG 1 registryLookup METHOD method_10295 getType ()Lnet/minecraft/class_2396; CLASS class_2395 Factory METHOD method_10296 read (Lnet/minecraft/class_2396;Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2394; ARG 1 type ARG 2 reader + ARG 3 registryLookup diff --git a/mappings/net/minecraft/recipe/RecipeManager.mapping b/mappings/net/minecraft/recipe/RecipeManager.mapping index 7a8b349cdd..8d10a6ed1a 100644 --- a/mappings/net/minecraft/recipe/RecipeManager.mapping +++ b/mappings/net/minecraft/recipe/RecipeManager.mapping @@ -4,11 +4,14 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/RecipeManager COMMENT from data packs' JSON files. FIELD field_19359 GSON Lcom/google/gson/Gson; FIELD field_36308 recipesById Ljava/util/Map; + FIELD field_48848 registryLookup Lnet/minecraft/class_7225$class_7874; FIELD field_9023 recipes Ljava/util/Map; FIELD field_9024 errored Z COMMENT This isn't quite indicating an errored state; its value is only set to COMMENT {@code false} and is never {@code true}, and isn't used anywhere. FIELD field_9027 LOGGER Lorg/slf4j/Logger; + METHOD (Lnet/minecraft/class_7225$class_7874;)V + ARG 1 registryLookup METHOD method_17717 getAllOfType (Lnet/minecraft/class_3956;)Ljava/util/Map; ARG 1 type METHOD method_17720 deserialize (Lnet/minecraft/class_2960;Lcom/google/gson/JsonObject;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_8786; @@ -23,6 +26,8 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/RecipeManager COMMENT @return the read recipe ARG 0 id COMMENT the recipe's ID + ARG 1 json + ARG 2 registryLookup METHOD method_17722 (Ljava/util/Map;)Ljava/util/stream/Stream; ARG 0 map METHOD method_17723 (Ljava/util/Map;)Ljava/util/stream/Stream; diff --git a/mappings/net/minecraft/registry/RegistryWrapper.mapping b/mappings/net/minecraft/registry/RegistryWrapper.mapping index 1adf602245..080bc6b477 100644 --- a/mappings/net/minecraft/registry/RegistryWrapper.mapping +++ b/mappings/net/minecraft/registry/RegistryWrapper.mapping @@ -15,6 +15,8 @@ CLASS net/minecraft/class_7225 net/minecraft/registry/RegistryWrapper ARG 1 feature METHOD method_46765 getRegistryKey ()Lnet/minecraft/class_5321; METHOD method_46766 getLifecycle ()Lcom/mojang/serialization/Lifecycle; + METHOD method_56882 withPredicateFilter (Ljava/util/function/Predicate;)Lnet/minecraft/class_7225$class_7226; + ARG 1 predicate CLASS 1 METHOD method_46756 (Ljava/util/function/Predicate;Lnet/minecraft/class_6880$class_6883;)Z ARG 1 entry diff --git a/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping b/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping index 7702df308a..159aafa81e 100644 --- a/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping +++ b/mappings/net/minecraft/scoreboard/ServerScoreboard.mapping @@ -19,6 +19,7 @@ CLASS net/minecraft/class_2995 net/minecraft/scoreboard/ServerScoreboard METHOD method_12941 runUpdateListeners ()V METHOD method_32704 stateFromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_273; ARG 1 nbt + ARG 2 registryLookup METHOD method_32705 createState ()Lnet/minecraft/class_273; METHOD method_52297 getPersistentStateType ()Lnet/minecraft/class_18$class_8645; CLASS class_2996 UpdateMode diff --git a/mappings/net/minecraft/server/DataPackContents.mapping b/mappings/net/minecraft/server/DataPackContents.mapping index ae5fdd7c7d..1a8d2fc862 100644 --- a/mappings/net/minecraft/server/DataPackContents.mapping +++ b/mappings/net/minecraft/server/DataPackContents.mapping @@ -13,6 +13,9 @@ CLASS net/minecraft/class_5350 net/minecraft/server/DataPackContents FIELD field_25342 functionLoader Lnet/minecraft/class_5349; FIELD field_36491 LOGGER Lorg/slf4j/Logger; METHOD (Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_7699;Lnet/minecraft/class_2170$class_5364;I)V + ARG 1 dynamicRegistryManager + ARG 2 enabledFeatures + ARG 3 environment ARG 4 functionPermissionLevel METHOD method_29465 getFunctionLoader ()Lnet/minecraft/class_5349; COMMENT {@return the function loader} @@ -63,6 +66,15 @@ CLASS net/minecraft/class_5350 net/minecraft/server/DataPackContents COMMENT Creates a new {@link net.minecraft.registry.entry.RegistryEntryList}, stores it and returns it. FIELD field_37826 Lnet/minecraft/class_5350$class_7158; COMMENT Throws an exception. - CLASS class_9180 + CLASS class_9180 ConfigurableWrapperLookup FIELD field_40912 entryListCreationPolicy Lnet/minecraft/class_5350$class_7158; + FIELD field_48786 dynamicRegistryManager Lnet/minecraft/class_5455; + METHOD (Lnet/minecraft/class_5455;)V + ARG 1 dynamicRegistryManager METHOD method_46724 setEntryListCreationPolicy (Lnet/minecraft/class_5350$class_7158;)V + ARG 1 entryListCreationPolicy + METHOD method_56623 getWrapper (Lnet/minecraft/class_7225$class_7226;Lnet/minecraft/class_7225$class_7226;)Lnet/minecraft/class_7225$class_7226; + ARG 1 readOnlyWrapper + ARG 2 tagCreatingWrapper + METHOD method_56624 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_7225$class_7226; + ARG 1 registry diff --git a/mappings/net/minecraft/server/Main.mapping b/mappings/net/minecraft/server/Main.mapping index e8173f6173..a112db9c0f 100644 --- a/mappings/net/minecraft/server/Main.mapping +++ b/mappings/net/minecraft/server/Main.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/server/Main ARG 1 dataFixer ARG 2 eraseCache ARG 3 continueCheck + ARG 4 dynamicRegistryManager ARG 5 recreateRegionFiles METHOD method_29734 (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Lnet/minecraft/class_3807;Lnet/minecraft/class_7497;Ljoptsimple/OptionSet;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljoptsimple/OptionSpec;Ljava/lang/Thread;)Lnet/minecraft/class_3176; ARG 11 thread diff --git a/mappings/net/minecraft/server/ServerAdvancementLoader.mapping b/mappings/net/minecraft/server/ServerAdvancementLoader.mapping index 32b90f3456..3b9966c2a7 100644 --- a/mappings/net/minecraft/server/ServerAdvancementLoader.mapping +++ b/mappings/net/minecraft/server/ServerAdvancementLoader.mapping @@ -4,9 +4,16 @@ CLASS net/minecraft/class_2989 net/minecraft/server/ServerAdvancementLoader FIELD field_13406 LOGGER Lorg/slf4j/Logger; FIELD field_44468 conditionManager Lnet/minecraft/class_60; FIELD field_46076 manager Lnet/minecraft/class_163; + FIELD field_48787 registryLookup Lnet/minecraft/class_7225$class_7874; + METHOD (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_60;)V + ARG 1 registryLookup + ARG 2 conditionManager METHOD method_12893 getAdvancements ()Ljava/util/Collection; METHOD method_12896 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_8779; ARG 1 id + METHOD method_20723 (Lnet/minecraft/class_6903;Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_2960;Lcom/google/gson/JsonElement;)V + ARG 3 id + ARG 4 json METHOD method_53646 getManager ()Lnet/minecraft/class_163; METHOD method_54921 validate (Lnet/minecraft/class_2960;Lnet/minecraft/class_161;)V ARG 1 id diff --git a/mappings/net/minecraft/server/command/BossBarCommand.mapping b/mappings/net/minecraft/server/command/BossBarCommand.mapping index 86eadc8935..5e729bf43c 100644 --- a/mappings/net/minecraft/server/command/BossBarCommand.mapping +++ b/mappings/net/minecraft/server/command/BossBarCommand.mapping @@ -75,6 +75,7 @@ CLASS net/minecraft/class_3019 net/minecraft/server/command/BossBarCommand ARG 0 context METHOD method_13053 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V ARG 0 dispatcher + ARG 1 registryAccess METHOD method_13054 getBossBar (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_3002; ARG 0 context METHOD method_13055 (Lcom/mojang/brigadier/context/CommandContext;)I diff --git a/mappings/net/minecraft/server/command/RaidCommand.mapping b/mappings/net/minecraft/server/command/RaidCommand.mapping index cb903aa1de..6a09dc59a9 100644 --- a/mappings/net/minecraft/server/command/RaidCommand.mapping +++ b/mappings/net/minecraft/server/command/RaidCommand.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_6329 net/minecraft/server/command/RaidCommand ARG 0 player METHOD method_36192 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V ARG 0 dispatcher + ARG 1 registryAccess METHOD method_36193 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD method_36194 executeGlow (Lnet/minecraft/class_2168;)I diff --git a/mappings/net/minecraft/server/command/ScoreboardCommand.mapping b/mappings/net/minecraft/server/command/ScoreboardCommand.mapping index b78a4dcdab..5262dbdd51 100644 --- a/mappings/net/minecraft/server/command/ScoreboardCommand.mapping +++ b/mappings/net/minecraft/server/command/ScoreboardCommand.mapping @@ -66,6 +66,7 @@ CLASS net/minecraft/class_3115 net/minecraft/server/command/ScoreboardCommand ARG 0 context METHOD method_13595 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V ARG 0 dispatcher + ARG 1 registryAccess METHOD method_13596 executeSetDisplay (Lnet/minecraft/class_2168;Lnet/minecraft/class_8646;Lnet/minecraft/class_266;)I ARG 0 source ARG 1 slot @@ -123,7 +124,12 @@ CLASS net/minecraft/class_3115 net/minecraft/server/command/ScoreboardCommand METHOD method_13614 executeListScores (Lnet/minecraft/class_2168;Lnet/minecraft/class_9015;)I ARG 0 source ARG 1 scoreHolder + METHOD method_55344 (Lnet/minecraft/class_3115$class_9008;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 1 context METHOD method_55345 makeNumberFormatArguments (Lnet/minecraft/class_7157;Lcom/mojang/brigadier/builder/ArgumentBuilder;Lnet/minecraft/class_3115$class_9008;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + ARG 0 registryAccess + ARG 1 argumentBuilder + ARG 2 executor METHOD method_55347 executeModifyObjectiveFormat (Lnet/minecraft/class_2168;Lnet/minecraft/class_266;Lnet/minecraft/class_9022;)I ARG 0 source ARG 1 objective @@ -144,6 +150,12 @@ CLASS net/minecraft/class_3115 net/minecraft/server/command/ScoreboardCommand ARG 3 numberFormat METHOD method_55352 getNextDisplayName (Ljava/util/Collection;)Lnet/minecraft/class_2561; ARG 0 targets + METHOD method_55355 (Lnet/minecraft/class_3115$class_9008;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 1 context + METHOD method_55360 (Lnet/minecraft/class_3115$class_9008;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 1 context + METHOD method_55363 (Lnet/minecraft/class_3115$class_9008;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 1 context CLASS class_9008 NumberFormatCommandExecutor METHOD run (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_9022;)I ARG 1 context diff --git a/mappings/net/minecraft/server/command/TeamCommand.mapping b/mappings/net/minecraft/server/command/TeamCommand.mapping index 1e2740ee3d..379f27188c 100644 --- a/mappings/net/minecraft/server/command/TeamCommand.mapping +++ b/mappings/net/minecraft/server/command/TeamCommand.mapping @@ -76,6 +76,7 @@ CLASS net/minecraft/class_3142 net/minecraft/server/command/TeamCommand ARG 2 visibility METHOD method_13736 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V ARG 0 dispatcher + ARG 1 registryAccess METHOD method_13737 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD method_13738 (Lcom/mojang/brigadier/context/CommandContext;)I diff --git a/mappings/net/minecraft/server/command/TellRawCommand.mapping b/mappings/net/minecraft/server/command/TellRawCommand.mapping index c77111ccea..e7df7f9a1d 100644 --- a/mappings/net/minecraft/server/command/TellRawCommand.mapping +++ b/mappings/net/minecraft/server/command/TellRawCommand.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_3146 net/minecraft/server/command/TellRawCommand METHOD method_13776 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V ARG 0 dispatcher + ARG 1 registryAccess METHOD method_13777 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD method_13778 (Lnet/minecraft/class_2168;)Z diff --git a/mappings/net/minecraft/server/command/TitleCommand.mapping b/mappings/net/minecraft/server/command/TitleCommand.mapping index af7ad4a013..a2b5f68f6f 100644 --- a/mappings/net/minecraft/server/command/TitleCommand.mapping +++ b/mappings/net/minecraft/server/command/TitleCommand.mapping @@ -16,6 +16,7 @@ CLASS net/minecraft/class_3151 net/minecraft/server/command/TitleCommand ARG 0 context METHOD method_13804 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V ARG 0 dispatcher + ARG 1 registryAccess METHOD method_13805 executeClear (Lnet/minecraft/class_2168;Ljava/util/Collection;)I ARG 0 source ARG 1 targets diff --git a/mappings/net/minecraft/sound/BlockSoundGroup.mapping b/mappings/net/minecraft/sound/BlockSoundGroup.mapping index 1314f89397..9bb2515789 100644 --- a/mappings/net/minecraft/sound/BlockSoundGroup.mapping +++ b/mappings/net/minecraft/sound/BlockSoundGroup.mapping @@ -116,6 +116,7 @@ CLASS net/minecraft/class_2498 net/minecraft/sound/BlockSoundGroup FIELD field_47085 COPPER_BULB Lnet/minecraft/class_2498; FIELD field_47086 COPPER_GRATE Lnet/minecraft/class_2498; FIELD field_47346 TRIAL_SPAWNER Lnet/minecraft/class_2498; + FIELD field_48855 VAULT Lnet/minecraft/class_2498; METHOD (FFLnet/minecraft/class_3414;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;)V ARG 1 volume ARG 2 pitch diff --git a/mappings/net/minecraft/state/property/Properties.mapping b/mappings/net/minecraft/state/property/Properties.mapping index 7b9d44c277..ca9ab72dd8 100644 --- a/mappings/net/minecraft/state/property/Properties.mapping +++ b/mappings/net/minecraft/state/property/Properties.mapping @@ -264,6 +264,7 @@ CLASS net/minecraft/class_2741 net/minecraft/state/property/Properties FIELD field_47408 TRIAL_SPAWNER_STATE Lnet/minecraft/class_2754; COMMENT A property that specifies the state of a trial spawner. FIELD field_48915 VAULT_STATE Lnet/minecraft/class_2754; + COMMENT A property that specifies the state of a vault. METHOD method_11813 (Lnet/minecraft/class_2768;)Z ARG 0 shape METHOD method_11814 (Lnet/minecraft/class_2350;)Z diff --git a/mappings/net/minecraft/structure/StructureTemplate.mapping b/mappings/net/minecraft/structure/StructureTemplate.mapping index d0130cbfe3..2332cd1bc2 100644 --- a/mappings/net/minecraft/structure/StructureTemplate.mapping +++ b/mappings/net/minecraft/structure/StructureTemplate.mapping @@ -116,6 +116,8 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/StructureTemplate METHOD method_17916 getEntity (Lnet/minecraft/class_5425;Lnet/minecraft/class_2487;)Ljava/util/Optional; ARG 0 world ARG 1 nbt + METHOD method_17917 (Lnet/minecraft/class_2470;Lnet/minecraft/class_2415;Lnet/minecraft/class_243;ZLnet/minecraft/class_5425;Lnet/minecraft/class_1297;)V + ARG 5 entity METHOD method_20532 updateCorner (Lnet/minecraft/class_1936;ILnet/minecraft/class_251;III)V ARG 0 world ARG 1 flags diff --git a/mappings/net/minecraft/test/TestContext.mapping b/mappings/net/minecraft/test/TestContext.mapping index 2f4c5b5b5e..f830636292 100644 --- a/mappings/net/minecraft/test/TestContext.mapping +++ b/mappings/net/minecraft/test/TestContext.mapping @@ -416,4 +416,6 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext METHOD method_56208 getEntities (Lnet/minecraft/class_1299;)Ljava/util/List; ARG 1 type METHOD method_56606 assertEquals (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/String;)V + ARG 1 value + ARG 2 expected ARG 3 name diff --git a/mappings/net/minecraft/text/TextCodecs.mapping b/mappings/net/minecraft/text/TextCodecs.mapping index b2999f2686..eeac4f9873 100644 --- a/mappings/net/minecraft/text/TextCodecs.mapping +++ b/mappings/net/minecraft/text/TextCodecs.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_8824 net/minecraft/text/TextCodecs FIELD field_46597 CODEC Lcom/mojang/serialization/Codec; FIELD field_46598 STRINGIFIED_CODEC Lcom/mojang/serialization/Codec; - FIELD field_48540 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_48540 REGISTRY_PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_48985 OPTIONAL_PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_48986 PACKET_CODEC Lnet/minecraft/class_9139; METHOD method_54164 (Lcom/google/gson/JsonElement;)Lcom/mojang/serialization/DataResult; ARG 0 json METHOD method_54165 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/util/DebugSampleType.mapping b/mappings/net/minecraft/util/DebugSampleType.mapping new file mode 100644 index 0000000000..6d5c8857da --- /dev/null +++ b/mappings/net/minecraft/util/DebugSampleType.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_9192 net/minecraft/util/DebugSampleType diff --git a/mappings/net/minecraft/util/JsonReaderUtils.mapping b/mappings/net/minecraft/util/JsonReaderUtils.mapping index 1779d2a9d8..6d172fdbf5 100644 --- a/mappings/net/minecraft/util/JsonReaderUtils.mapping +++ b/mappings/net/minecraft/util/JsonReaderUtils.mapping @@ -4,3 +4,6 @@ CLASS net/minecraft/class_9010 net/minecraft/util/JsonReaderUtils METHOD method_55376 getPos (Lcom/google/gson/stream/JsonReader;)I ARG 0 jsonReader METHOD method_55377 parse (Lnet/minecraft/class_7225$class_7874;Lcom/mojang/brigadier/StringReader;Lcom/mojang/serialization/Codec;)Ljava/lang/Object; + ARG 0 registryLookup + ARG 1 stringReader + ARG 2 codec diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index 77e4c3be50..affefeabfa 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -316,6 +316,10 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util ARG 1 exceptionGetter METHOD method_55473 getDownloadWorkerExecutor ()Ljava/util/concurrent/ExecutorService; COMMENT {@return the executor for download tasks} + METHOD method_56613 allOf (Ljava/util/List;)Ljava/util/function/Predicate; + ARG 0 predicates + METHOD method_56616 anyOf (Ljava/util/List;)Ljava/util/function/Predicate; + ARG 0 predicates METHOD method_645 previous (Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/lang/Object; COMMENT {@return the item preceding {@code object} in {@code iterable}} COMMENT diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping index 2656f3f666..83aaa766c1 100644 --- a/mappings/net/minecraft/util/dynamic/Codecs.mapping +++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping @@ -300,6 +300,8 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 2 typeCodec ARG 3 typeGetter ARG 4 parametersCodecGetter + METHOD method_56627 createRecursiveMap (Ljava/util/function/Function;)Lcom/mojang/serialization/MapCodec; + ARG 0 codecFunction CLASS 1 METHOD apply (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;Lcom/mojang/serialization/DataResult;)Lcom/mojang/serialization/DataResult; ARG 1 ops @@ -484,3 +486,15 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 2 map METHOD method_53707 (Ljava/lang/Object;Ljava/util/Map;)Lcom/mojang/datafixers/util/Pair; ARG 1 map + CLASS class_9181 RecursiveMap + FIELD field_48804 supplier Ljava/util/function/Supplier; + METHOD (Ljava/util/function/Function;)V + ARG 1 codecFunction + METHOD decode (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/MapLike;)Lcom/mojang/serialization/DataResult; + ARG 1 ops + ARG 2 input + METHOD encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/RecordBuilder;)Lcom/mojang/serialization/RecordBuilder; + ARG 1 input + ARG 2 ops + METHOD keys (Lcom/mojang/serialization/DynamicOps;)Ljava/util/stream/Stream; + ARG 1 ops diff --git a/mappings/net/minecraft/util/math/random/RandomSequencesState.mapping b/mappings/net/minecraft/util/math/random/RandomSequencesState.mapping index f34e237006..c9bc58a152 100644 --- a/mappings/net/minecraft/util/math/random/RandomSequencesState.mapping +++ b/mappings/net/minecraft/util/math/random/RandomSequencesState.mapping @@ -35,6 +35,7 @@ CLASS net/minecraft/class_8565 net/minecraft/util/math/random/RandomSequencesSta ARG 2 fallback METHOD method_52516 (JLnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_8565; ARG 2 nbt + ARG 3 registryLookup METHOD method_52517 reset (Lnet/minecraft/class_2960;)V ARG 1 id METHOD method_52518 createSequence (Lnet/minecraft/class_2960;IZZ)Lnet/minecraft/class_8564; diff --git a/mappings/net/minecraft/village/TradeOffer.mapping b/mappings/net/minecraft/village/TradeOffer.mapping index 557aa1ca70..088338327f 100644 --- a/mappings/net/minecraft/village/TradeOffer.mapping +++ b/mappings/net/minecraft/village/TradeOffer.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer FIELD field_18679 merchantExperience I FIELD field_48371 PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_48372 ignoreNbt Z + FIELD field_48849 CODEC Lcom/mojang/serialization/Codec; FIELD field_9143 secondBuyItem Lnet/minecraft/class_1799; FIELD field_9144 maxUses I FIELD field_9145 rewardingPlayerExperience Z @@ -38,11 +39,31 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer ARG 3 sellItem ARG 4 uses ARG 5 maxUses + ARG 6 merchantExperience ARG 7 priceMultiplier + ARG 8 demandBonus + METHOD (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;IIIFIZ)V + ARG 1 firstBuyItem + ARG 2 secondBuyItem + ARG 3 sellItem + ARG 4 uses + ARG 5 maxUses + ARG 6 merchantExperience + ARG 7 priceMultiplier + ARG 8 demandBonus + ARG 9 ignoreNbt METHOD (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;IIZIIFIZ)V ARG 1 firstBuyItem ARG 2 secondBuyItem ARG 3 sellItem + ARG 4 uses + ARG 5 maxUses + ARG 6 rewardingPlayerExperience + ARG 7 specialPrice + ARG 8 demandBonus + ARG 9 priceMultiplier + ARG 10 merchantExperience + ARG 11 ignoreNbt METHOD (Lnet/minecraft/class_1914;)V ARG 1 offer METHOD method_16952 matchesBuyItems (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z @@ -104,6 +125,30 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer ARG 0 buf ARG 1 offer METHOD method_56112 shouldIgnoreNbt ()Z + METHOD method_56705 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_56706 (Lnet/minecraft/class_1914;)Ljava/lang/Boolean; + ARG 0 tradeOffer + METHOD method_56707 (Lnet/minecraft/class_1914;)Ljava/lang/Integer; + ARG 0 tradeOffer + METHOD method_56708 (Lnet/minecraft/class_1914;)Ljava/lang/Float; + ARG 0 tradeOffer + METHOD method_56709 (Lnet/minecraft/class_1914;)Ljava/lang/Integer; + ARG 0 tradeOffer + METHOD method_56710 (Lnet/minecraft/class_1914;)Ljava/lang/Integer; + ARG 0 tradeOffer + METHOD method_56711 (Lnet/minecraft/class_1914;)Ljava/lang/Boolean; + ARG 0 tradeOffer + METHOD method_56712 (Lnet/minecraft/class_1914;)Ljava/lang/Integer; + ARG 0 tradeOffer + METHOD method_56713 (Lnet/minecraft/class_1914;)Ljava/lang/Integer; + ARG 0 tradeOffer + METHOD method_56714 (Lnet/minecraft/class_1914;)Lnet/minecraft/class_1799; + ARG 0 tradeOffer + METHOD method_56715 (Lnet/minecraft/class_1914;)Lnet/minecraft/class_1799; + ARG 0 tradeOffer + METHOD method_56716 (Lnet/minecraft/class_1914;)Lnet/minecraft/class_1799; + ARG 0 tradeOffer METHOD method_8244 use ()V COMMENT Increments the number of times this trade offer has been used. METHOD method_8245 increaseSpecialPrice (I)V diff --git a/mappings/net/minecraft/village/TradeOfferList.mapping b/mappings/net/minecraft/village/TradeOfferList.mapping index c505eeaa14..057e708d60 100644 --- a/mappings/net/minecraft/village/TradeOfferList.mapping +++ b/mappings/net/minecraft/village/TradeOfferList.mapping @@ -1,7 +1,10 @@ CLASS net/minecraft/class_1916 net/minecraft/village/TradeOfferList FIELD field_48373 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_48850 CODEC Lcom/mojang/serialization/Codec; METHOD (I)V ARG 1 size + METHOD (Ljava/util/Collection;)V + ARG 1 tradeOffers METHOD method_53882 copy ()Lnet/minecraft/class_1916; METHOD method_8267 getValidOffer (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;I)Lnet/minecraft/class_1914; ARG 1 firstBuyItem diff --git a/mappings/net/minecraft/village/raid/RaidManager.mapping b/mappings/net/minecraft/village/raid/RaidManager.mapping index 9516739566..e525e92c17 100644 --- a/mappings/net/minecraft/village/raid/RaidManager.mapping +++ b/mappings/net/minecraft/village/raid/RaidManager.mapping @@ -29,6 +29,7 @@ CLASS net/minecraft/class_3767 net/minecraft/village/raid/RaidManager ARG 0 world METHOD method_52561 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_3767; ARG 1 nbt + ARG 2 registryLookup METHOD method_77 fromNbt (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)Lnet/minecraft/class_3767; ARG 0 world ARG 1 nbt diff --git a/mappings/net/minecraft/world/ChunkUpdateState.mapping b/mappings/net/minecraft/world/ChunkUpdateState.mapping index cedbed649c..2ad9fa10e5 100644 --- a/mappings/net/minecraft/world/ChunkUpdateState.mapping +++ b/mappings/net/minecraft/world/ChunkUpdateState.mapping @@ -17,4 +17,5 @@ CLASS net/minecraft/class_3440 net/minecraft/world/ChunkUpdateState METHOD method_14898 getAll ()Lit/unimi/dsi/fastutil/longs/LongSet; METHOD method_32358 fromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_3440; ARG 0 nbt + ARG 1 registryLookup METHOD method_52601 getPersistentStateType ()Lnet/minecraft/class_18$class_8645; diff --git a/mappings/net/minecraft/world/ForcedChunkState.mapping b/mappings/net/minecraft/world/ForcedChunkState.mapping index 96e28a06b2..b51c3358d0 100644 --- a/mappings/net/minecraft/world/ForcedChunkState.mapping +++ b/mappings/net/minecraft/world/ForcedChunkState.mapping @@ -6,5 +6,6 @@ CLASS net/minecraft/class_1932 net/minecraft/world/ForcedChunkState ARG 1 chunks METHOD method_32350 fromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_1932; ARG 0 nbt + ARG 1 registryLookup METHOD method_52570 getPersistentStateType ()Lnet/minecraft/class_18$class_8645; METHOD method_8375 getChunks ()Lit/unimi/dsi/fastutil/longs/LongSet; diff --git a/mappings/net/minecraft/world/IdCountsState.mapping b/mappings/net/minecraft/world/IdCountsState.mapping index 80b3732789..bd965258da 100644 --- a/mappings/net/minecraft/world/IdCountsState.mapping +++ b/mappings/net/minecraft/world/IdCountsState.mapping @@ -4,4 +4,5 @@ CLASS net/minecraft/class_3978 net/minecraft/world/IdCountsState METHOD method_17920 getNextMapId ()Lnet/minecraft/class_9209; METHOD method_32360 fromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_3978; ARG 0 nbt + ARG 1 registryLookup METHOD method_52610 getPersistentStateType ()Lnet/minecraft/class_18$class_8645; diff --git a/mappings/net/minecraft/world/PersistentState.mapping b/mappings/net/minecraft/world/PersistentState.mapping index c7a6171554..eb042d1eab 100644 --- a/mappings/net/minecraft/world/PersistentState.mapping +++ b/mappings/net/minecraft/world/PersistentState.mapping @@ -3,8 +3,10 @@ CLASS net/minecraft/class_18 net/minecraft/world/PersistentState FIELD field_72 dirty Z METHOD method_17919 save (Ljava/io/File;Lnet/minecraft/class_7225$class_7874;)V ARG 1 file + ARG 2 registryLookup METHOD method_75 writeNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487; ARG 1 nbt + ARG 2 registryLookup METHOD method_78 setDirty (Z)V ARG 1 dirty METHOD method_79 isDirty ()Z diff --git a/mappings/net/minecraft/world/PersistentStateManager.mapping b/mappings/net/minecraft/world/PersistentStateManager.mapping index 18976f6f5d..f12d0271e6 100644 --- a/mappings/net/minecraft/world/PersistentStateManager.mapping +++ b/mappings/net/minecraft/world/PersistentStateManager.mapping @@ -3,10 +3,13 @@ CLASS net/minecraft/class_26 net/minecraft/world/PersistentStateManager FIELD field_136 LOGGER Lorg/slf4j/Logger; FIELD field_17663 dataFixer Lcom/mojang/datafixers/DataFixer; FIELD field_17664 directory Ljava/io/File; + FIELD field_48926 registryLookup Lnet/minecraft/class_7225$class_7874; METHOD (Ljava/io/File;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_7225$class_7874;)V ARG 1 directory ARG 2 dataFixer + ARG 3 registryLookup METHOD method_120 readFromFile (Ljava/util/function/BiFunction;Lnet/minecraft/class_4284;Ljava/lang/String;)Lnet/minecraft/class_18; + ARG 1 readFunction ARG 2 dataFixTypes ARG 3 id METHOD method_123 set (Ljava/lang/String;Lnet/minecraft/class_18;)V diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index d2a846af18..aaf5aa03ab 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -58,8 +58,10 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 13 velocityZ METHOD method_17889 getNextMapId ()Lnet/minecraft/class_9209; METHOD method_17890 putMapState (Lnet/minecraft/class_9209;Lnet/minecraft/class_22;)V + ARG 1 id ARG 2 state METHOD method_17891 getMapState (Lnet/minecraft/class_9209;)Lnet/minecraft/class_22; + ARG 1 id METHOD method_18471 tickBlockEntities ()V METHOD method_18472 tickEntity (Ljava/util/function/Consumer;Lnet/minecraft/class_1297;)V ARG 1 tickConsumer diff --git a/mappings/net/minecraft/world/WorldEvents.mapping b/mappings/net/minecraft/world/WorldEvents.mapping index 99d70cbe29..28d85524b0 100644 --- a/mappings/net/minecraft/world/WorldEvents.mapping +++ b/mappings/net/minecraft/world/WorldEvents.mapping @@ -357,3 +357,15 @@ CLASS net/minecraft/class_6088 net/minecraft/world/WorldEvents COMMENT
Spawns happy villager particles. COMMENT

The amount of particles to spawn must be supplied as extra data. COMMENT

Called by {@link net.minecraft.block.TurtleEggBlock#onBlockAdded(net.minecraft.block.BlockState, net.minecraft.world.World, net.minecraft.util.math.BlockPos, net.minecraft.block.BlockState, boolean) TurtleEggBlock#onBlockAdded} + FIELD field_48852 VAULT_ACTIVATES I + COMMENT A vault is activated. + COMMENT
Plays the activate sound and spawns smoke and small flame particles. + COMMENT

Called by {@link net.minecraft.block.vault.VaultState#ACTIVE}. + FIELD field_48853 VAULT_DEACTIVATES I + COMMENT A vault is deactivated. + COMMENT
Plays the deactivate sound and spawns small flame particles. + COMMENT

Called by {@link net.minecraft.block.vault.VaultState#INACTIVE}. + FIELD field_48854 VAULT_EJECTS_ITEM I + COMMENT A vault ejects loot. + COMMENT
Spawns ejection particles. + COMMENT

Called by {@link net.minecraft.block.vault.VaultState#ejectItem}. diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index 0cadd49264..2c76142062 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -87,6 +87,7 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk ARG 2 upperHeight METHOD method_20598 getPackedBlockEntityNbt (Lnet/minecraft/class_2338;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487; ARG 1 pos + ARG 2 registryLookup METHOD method_32914 getGameEventDispatcher (I)Lnet/minecraft/class_5713; ARG 1 ySectionCoord METHOD method_38255 getOrCreateChunkNoiseSampler (Ljava/util/function/Function;)Lnet/minecraft/class_6568; diff --git a/mappings/net/minecraft/world/updater/WorldUpdater.mapping b/mappings/net/minecraft/world/updater/WorldUpdater.mapping index 8ca01a050a..cfd5ebae25 100644 --- a/mappings/net/minecraft/world/updater/WorldUpdater.mapping +++ b/mappings/net/minecraft/world/updater/WorldUpdater.mapping @@ -29,6 +29,7 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater METHOD (Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_5455;ZZ)V ARG 1 session ARG 2 dataFixer + ARG 3 dynamicRegistryManager ARG 4 eraseCache ARG 5 recreateRegionFiles METHOD method_28304 getWorlds ()Ljava/util/Set; diff --git a/unpick-definitions/world_events.unpick b/unpick-definitions/world_events.unpick index 98c7df2ca6..744a4980ff 100644 --- a/unpick-definitions/world_events.unpick +++ b/unpick-definitions/world_events.unpick @@ -74,6 +74,9 @@ constant world_events net/minecraft/world/WorldEvents TRIAL_SPAWNER_DETECTS_PLAY constant world_events net/minecraft/world/WorldEvents TRIAL_SPAWNER_EJECTS_ITEM constant world_events net/minecraft/world/WorldEvents BEE_FERTILIZES_PLANT constant world_events net/minecraft/world/WorldEvents TURTLE_EGG_PLACED +constant world_events net/minecraft/world/WorldEvents VAULT_ACTIVATES +constant world_events net/minecraft/world/WorldEvents VAULT_DEACTIVATES +constant world_events net/minecraft/world/WorldEvents VAULT_EJECTS_ITEM target_method net/minecraft/world/WorldAccess syncWorldEvent (Lnet/minecraft/entity/player/PlayerEntity;ILnet/minecraft/util/math/BlockPos;I)V param 1 world_events