From 1a6cb21e97dc021305dd9b42143ddae2bc47147a Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Fri, 1 Mar 2024 11:50:01 +0900 Subject: [PATCH] 24w09a more stuff (#3803) * loot, scoreboard, screen, village * Map chunk stuff * Finish the stuff (mostly) --- .../net/minecraft/block/AbstractBlock.mapping | 2 +- .../block/cauldron/CauldronBehavior.mapping | 2 +- .../net/minecraft/client/gui/EditBox.mapping | 2 +- .../client/toast/SystemToast.mapping | 11 ++ .../enchantment/EnchantmentHelper.mapping | 2 +- .../ai/pathing/PathNodeTypeCache.mapping | 18 +++ .../minecraft/inventory/Inventories.mapping | 18 +-- .../inventory/SimpleInventory.mapping | 4 +- mappings/net/minecraft/item/ItemStack.mapping | 70 +++------- mappings/net/minecraft/loot/LootTable.mapping | 1 + .../loot/context/LootContextTypes.mapping | 2 + .../loot/entry/LootTableEntry.mapping | 19 +++ .../CopyComponentsLootFunction.mapping | 31 +++++ .../loot/function/CopyStateFunction.mapping | 2 + .../SetAttributesLootFunction.mapping | 2 + .../function/SetBannerPatternFunction.mapping | 4 + .../function/SetContentsLootFunction.mapping | 2 + .../SetEnchantmentsLootFunction.mapping | 5 + .../loot/function/SetLoreLootFunction.mapping | 5 + .../loot/function/SetNbtLootFunction.mapping | 4 + .../minecraft/network/PacketByteBuf.mapping | 12 -- .../c2s/play/ChatMessageC2SPacket.mapping | 2 +- .../play/CommandExecutionC2SPacket.mapping | 2 +- mappings/net/minecraft/potion/Potion.mapping | 3 + .../minecraft/registry/RegistryOps.mapping | 2 + .../minecraft/scoreboard/Scoreboard.mapping | 14 ++ .../scoreboard/ScoreboardScore.mapping | 2 + .../scoreboard/ScoreboardState.mapping | 5 + .../net/minecraft/scoreboard/Scores.mapping | 2 + .../screen/GrindstoneScreenHandler.mapping | 6 + .../screen/LoomScreenHandler.mapping | 2 + .../screen/MerchantScreenHandler.mapping | 2 + .../minecraft/server/MinecraftServer.mapping | 4 + .../server/command/PlaySoundCommand.mapping | 6 + .../server/command/ResetChunksCommand.mapping | 4 + .../server/command/TestCommand.mapping | 4 + .../server/command/TestFinder.mapping | 20 +++ .../integrated/IntegratedServer.mapping | 1 + .../integrated/IntegratedServerLoader.mapping | 51 ++++++++ .../network/ServerPlayNetworkHandler.mapping | 5 + .../server/world/ChunkHolder.mapping | 3 + .../server/world/ChunkTicketManager.mapping | 2 + .../server/world/OptionalChunk.mapping | 22 ++++ .../server/world/ServerWorld.mapping | 2 + .../net/minecraft/village/TradeOffer.mapping | 13 +- .../net/minecraft/village/TradeOffers.mapping | 9 ++ .../net/minecraft/village/TradedItem.mapping | 23 ++++ .../minecraft/world/ChunkSerializer.mapping | 3 + .../world/CommandBlockExecutor.mapping | 7 + mappings/net/minecraft/world/World.mapping | 1 + .../world/chunk/ChunkGenerating.mapping | 120 ++++++++++++++++++ .../chunk/ChunkGenerationContext.mapping | 5 + .../minecraft/world/chunk/ChunkStatus.mapping | 21 +++ .../world/chunk/FullChunkConverter.mapping | 3 + .../world/gen/StructureAccessor.mapping | 7 + .../world/level/storage/LevelStorage.mapping | 3 + 56 files changed, 513 insertions(+), 86 deletions(-) create mode 100644 mappings/net/minecraft/entity/ai/pathing/PathNodeTypeCache.mapping create mode 100644 mappings/net/minecraft/loot/function/CopyComponentsLootFunction.mapping create mode 100644 mappings/net/minecraft/server/world/OptionalChunk.mapping create mode 100644 mappings/net/minecraft/village/TradedItem.mapping create mode 100644 mappings/net/minecraft/world/chunk/ChunkGenerating.mapping create mode 100644 mappings/net/minecraft/world/chunk/ChunkGenerationContext.mapping create mode 100644 mappings/net/minecraft/world/chunk/FullChunkConverter.mapping diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index 64c76da7e3..98346c29e3 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -222,7 +222,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock FIELD field_23154 dynamicBounds Z COMMENT Whether this block's collision shape can change. COMMENT - COMMENT @see #hasDynamicBounds + COMMENT @see Block#hasDynamicBounds FIELD field_23155 settings Lnet/minecraft/class_4970$class_2251; COMMENT The {@link AbstractBlock.Settings} to apply to this block. FIELD field_23156 lootTableId Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping b/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping index c5fe186d9b..35ed84539a 100644 --- a/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping +++ b/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping @@ -59,7 +59,7 @@ CLASS net/minecraft/class_5620 net/minecraft/block/cauldron/CauldronBehavior FIELD field_27781 CLEAN_BANNER Lnet/minecraft/class_5620; COMMENT A behavior that cleans banners with patterns. FIELD field_27782 CLEAN_DYEABLE_ITEM Lnet/minecraft/class_5620; - COMMENT A behavior that cleans {@linkplain net.minecraft.item.DyeableItem dyeable items}. + COMMENT A behavior that cleans dyeable items. FIELD field_28011 POWDER_SNOW_CAULDRON_BEHAVIOR Lnet/minecraft/class_5620$class_8821; COMMENT The cauldron behaviors for powder snow cauldrons. COMMENT diff --git a/mappings/net/minecraft/client/gui/EditBox.mapping b/mappings/net/minecraft/client/gui/EditBox.mapping index bc56450f22..09f3d05048 100644 --- a/mappings/net/minecraft/client/gui/EditBox.mapping +++ b/mappings/net/minecraft/client/gui/EditBox.mapping @@ -84,7 +84,7 @@ CLASS net/minecraft/class_7530 net/minecraft/client/gui/EditBox METHOD method_44420 replaceSelection (Ljava/lang/String;)V COMMENT Replaces the current selection with {@code string}. If there is no COMMENT selection, this inserts the string at the cursor position. This removes - COMMENT {@linkplain net.minecraft.SharedConstants#isValidChar invalid characters} and truncates + COMMENT {@linkplain net.minecraft.util.StringHelper#isValidChar invalid characters} and truncates COMMENT the passed string if necessary. ARG 1 string METHOD method_44421 getText ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/toast/SystemToast.mapping b/mappings/net/minecraft/client/toast/SystemToast.mapping index 3060338f7a..f8db0e13a7 100644 --- a/mappings/net/minecraft/client/toast/SystemToast.mapping +++ b/mappings/net/minecraft/client/toast/SystemToast.mapping @@ -54,6 +54,14 @@ CLASS net/minecraft/class_370 net/minecraft/client/toast/SystemToast ARG 0 manager ARG 1 type METHOD method_55508 hide ()V + METHOD method_57723 addLowDiskSpace (Lnet/minecraft/class_310;)V + ARG 0 client + METHOD method_57724 addChunkLoadFailure (Lnet/minecraft/class_310;Lnet/minecraft/class_1923;)V + ARG 0 client + ARG 1 pos + METHOD method_57725 addChunkSaveFailure (Lnet/minecraft/class_310;Lnet/minecraft/class_1923;)V + ARG 0 client + ARG 1 pos CLASS class_9037 Type FIELD field_47583 NARRATOR_TOGGLE Lnet/minecraft/class_370$class_9037; FIELD field_47584 WORLD_BACKUP Lnet/minecraft/class_370$class_9037; @@ -63,5 +71,8 @@ CLASS net/minecraft/class_370 net/minecraft/client/toast/SystemToast FIELD field_47588 PERIODIC_NOTIFICATION Lnet/minecraft/class_370$class_9037; FIELD field_47589 UNSECURE_SERVER_WARNING Lnet/minecraft/class_370$class_9037; FIELD field_47590 displayDuration J + FIELD field_49487 LOW_DISK_SPACE Lnet/minecraft/class_370$class_9037; + FIELD field_49488 CHUNK_LOAD_FAILURE Lnet/minecraft/class_370$class_9037; + FIELD field_49489 CHUNK_SAVE_FAILURE Lnet/minecraft/class_370$class_9037; METHOD (J)V ARG 1 displayDuration diff --git a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping index e5f1c69e31..c46a91cc59 100644 --- a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping +++ b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping @@ -20,7 +20,7 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper ARG 0 entity METHOD method_49189 hasSilkTouch (Lnet/minecraft/class_1799;)Z ARG 0 stack - METHOD method_57529 hasEnchamtments (Lnet/minecraft/class_1799;)Z + METHOD method_57529 hasEnchantments (Lnet/minecraft/class_1799;)Z ARG 0 stack METHOD method_57530 set (Lnet/minecraft/class_1799;Lnet/minecraft/class_9304;)V ARG 0 stack diff --git a/mappings/net/minecraft/entity/ai/pathing/PathNodeTypeCache.mapping b/mappings/net/minecraft/entity/ai/pathing/PathNodeTypeCache.mapping new file mode 100644 index 0000000000..e7963ff73c --- /dev/null +++ b/mappings/net/minecraft/entity/ai/pathing/PathNodeTypeCache.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/class_9315 net/minecraft/entity/ai/pathing/PathNodeTypeCache + FIELD field_49419 positions [J + FIELD field_49420 cache [Lnet/minecraft/class_7; + METHOD method_57616 get (IJ)Lnet/minecraft/class_7; + ARG 1 index + ARG 2 pos + METHOD method_57617 hash (J)I + ARG 0 pos + METHOD method_57618 add (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_7; + ARG 1 world + ARG 2 pos + METHOD method_57619 compute (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;IJ)Lnet/minecraft/class_7; + ARG 1 world + ARG 2 pos + ARG 3 index + ARG 4 longPos + METHOD method_57620 invalidate (Lnet/minecraft/class_2338;)V + ARG 1 pos diff --git a/mappings/net/minecraft/inventory/Inventories.mapping b/mappings/net/minecraft/inventory/Inventories.mapping index e80bdaf037..1cc8158231 100644 --- a/mappings/net/minecraft/inventory/Inventories.mapping +++ b/mappings/net/minecraft/inventory/Inventories.mapping @@ -21,11 +21,11 @@ CLASS net/minecraft/class_1262 net/minecraft/inventory/Inventories COMMENT Writes the inventory to {@code nbt}. This method will always write to the NBT, COMMENT even if {@code stacks} only contains empty stacks. COMMENT - COMMENT

See {@link #writeNbt(NbtCompound, DefaultedList, boolean)} for the serialization - COMMENT format. + COMMENT

See {@link #writeNbt(NbtCompound, DefaultedList, boolean, RegistryWrapper.WrapperLookup)} + COMMENT for the serialization format. COMMENT - COMMENT @see #readNbt(NbtCompound, DefaultedList) - COMMENT @see #writeNbt(NbtCompound, DefaultedList, boolean) + COMMENT @see #readNbt(NbtCompound, DefaultedList, RegistryWrapper.WrapperLookup) + COMMENT @see #writeNbt(NbtCompound, DefaultedList, boolean, RegistryWrapper.WrapperLookup) COMMENT @return the passed {@code nbt} ARG 0 nbt ARG 1 stacks @@ -42,7 +42,7 @@ CLASS net/minecraft/class_1262 net/minecraft/inventory/Inventories COMMENT then {@code nbt} will not be modified at all. Otherwise, the {@code Items} entry COMMENT will always be present. COMMENT - COMMENT @see #readNbt(NbtCompound, DefaultedList) + COMMENT @see #readNbt(NbtCompound, DefaultedList, RegistryWrapper.WrapperLookup) COMMENT @return the passed {@code nbt} ARG 0 nbt ARG 1 stacks @@ -62,11 +62,11 @@ CLASS net/minecraft/class_1262 net/minecraft/inventory/Inventories METHOD method_5429 readNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_2371;Lnet/minecraft/class_7225$class_7874;)V COMMENT Reads {@code nbt} and sets the elements of {@code stacks} accordingly. COMMENT - COMMENT

See {@link #writeNbt(NbtCompound, DefaultedList, boolean)} for the serialization - COMMENT format. If the slot is out of bounds, it is ignored. + COMMENT

See {@link #writeNbt(NbtCompound, DefaultedList, boolean, RegistryWrapper.WrapperLookup)} + COMMENT for the serialization format. If the slot is out of bounds, it is ignored. COMMENT - COMMENT @see #writeNbt(NbtCompound, DefaultedList) - COMMENT @see #writeNbt(NbtCompound, DefaultedList, boolean) + COMMENT @see #writeNbt(NbtCompound, DefaultedList, RegistryWrapper.WrapperLookup) + COMMENT @see #writeNbt(NbtCompound, DefaultedList, boolean, RegistryWrapper.WrapperLookup) ARG 0 nbt ARG 1 stacks ARG 2 registries diff --git a/mappings/net/minecraft/inventory/SimpleInventory.mapping b/mappings/net/minecraft/inventory/SimpleInventory.mapping index 64a9319f01..6dfb738c30 100644 --- a/mappings/net/minecraft/inventory/SimpleInventory.mapping +++ b/mappings/net/minecraft/inventory/SimpleInventory.mapping @@ -71,9 +71,9 @@ CLASS net/minecraft/class_1277 net/minecraft/inventory/SimpleInventory ARG 1 list ARG 2 registries METHOD method_7660 toNbtList (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2499; - COMMENT {@return an NBT list of non-empty {@linkplain ItemStack#writeNbt item stacks}} + COMMENT {@return an NBT list of non-empty {@linkplain ItemStack#encode(RegistryWrapper.WrapperLookup) item stacks}} COMMENT - COMMENT

Unlike {@link Inventories#writeNbt(NbtCompound, DefaultedList, boolean)}, + COMMENT

Unlike {@link Inventories#writeNbt(NbtCompound, DefaultedList, boolean, RegistryWrapper.WrapperLookup)}, COMMENT this does not serialize the slots. COMMENT COMMENT @see #readNbtList diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 33cae4cea0..c79ca7ca85 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT Represents a stack of items. This is a data container that holds the item count - COMMENT and the stack's NBT. Logics for items (such as the action for using it) are delegated + COMMENT and the stack's components. Logics for items (such as the action for using it) are delegated COMMENT to the stack's logic container, {@link Item}. Instances can be created using one of COMMENT the constructors and are usually stored in an {@link net.minecraft.inventory.Inventory}. COMMENT @@ -19,7 +19,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT COMMENT

NBT serialization

COMMENT - COMMENT An Item Stack can be serialized with {@link #writeNbt(NbtCompound)}, and deserialized with {@link #fromNbt(NbtCompound)}. + COMMENT An Item Stack can be serialized with {@link #encode(RegistryWrapper.WrapperLookup)}, and deserialized with {@link #fromNbt(RegistryWrapper.WrapperLookup, NbtCompound)}. COMMENT COMMENT
COMMENT @@ -31,52 +31,10 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT COMMENT COMMENT - COMMENT + COMMENT COMMENT COMMENT - COMMENT - COMMENT - COMMENT
{@code id}{@link net.minecraft.nbt.NbtString}The identifier of the item.
{@code Count}{@link net.minecraft.nbt.NbtByte}The count of items in the stack.{@code count}{@link net.minecraft.nbt.NbtInt}The count of items in the stack.
{@code tag}{@link NbtCompound}The item stack's custom NBT.
- COMMENT
- COMMENT - COMMENT

Custom NBT

- COMMENT - COMMENT The item stack's custom NBT may be used to store extra information, - COMMENT like the block entity data for shulker boxes, - COMMENT or the damage of a damageable item, etc. - COMMENT

- COMMENT Various methods are available to interact with the custom NBT, some methods might refer to a "sub NBT", - COMMENT a sub NBT is a child element of the custom NBT. - COMMENT - COMMENT

- COMMENT - COMMENT - COMMENT - COMMENT - COMMENT - COMMENT - COMMENT - COMMENT - COMMENT - COMMENT - COMMENT - COMMENT - COMMENT - COMMENT - COMMENT - COMMENT - COMMENT - COMMENT - COMMENT - COMMENT - COMMENT - COMMENT - COMMENT - COMMENT - COMMENT - COMMENT - COMMENT - COMMENT + COMMENT COMMENT COMMENT
Custom NBT operations
CategoryMethodSummary
Custom NBT{@link #hasNbt()}Returns whether the item stack has custom NBT.
Custom NBT{@link #getNbt()}Returns the custom NBT of the item stack.
Custom NBT{@link #getOrCreateNbt()}Returns the custom NBT of the item stack, or creates one if absent, mutating the stack.
Custom NBT{@link #setNbt(NbtCompound)}Sets the custom NBT of the item stack.
Sub Custom NBT{@link #getSubNbt(String)}Returns the sub NBT compound at the specified key.
Sub Custom NBT{@link #getOrCreateSubNbt(String)}Returns the sub NBT compound at the specified key, or create one if absent, mutating the stack.
Sub Custom NBT{@link #removeSubNbt(String)}Removes the sub NBT element at the specified key.
Sub Custom NBT{@link #setSubNbt(String, NbtElement)}Sets the sub NBT element at the specified key.{@code components}{@link ComponentChanges}The item stack's components.
COMMENT
@@ -248,6 +206,8 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack ARG 2 attributeModifierConsumer METHOD method_57355 hashCode (Lnet/minecraft/class_1799;)I ARG 0 stack + METHOD method_57356 (Lnet/minecraft/class_1887;ILnet/minecraft/class_9304$class_9305;)V + ARG 2 builder METHOD method_57357 canPlaceOn (Lnet/minecraft/class_2694;)Z ARG 1 pos METHOD method_57358 encode (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2520; @@ -340,9 +300,8 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack METHOD method_7919 getDamage ()I COMMENT {@return the damage (lost durability) of the item stack} COMMENT - COMMENT

The damage is stored in NBT under {@value #DAMAGE_KEY} key. Note that this method - COMMENT does not check if the item is {@linkplain #isDamageable damageable}, unlike {@link - COMMENT #isDamaged}. + COMMENT

Note that this method does not check if the item is {@linkplain #isDamageable + COMMENT damageable}, unlike {@link #isDamaged}. COMMENT COMMENT @see #isDamageable COMMENT @see #isDamaged @@ -381,9 +340,10 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT {@return whether the item stack has any enchantments} COMMENT COMMENT

This will return {@code false} for enchanted books, as the book itself is not - COMMENT enchanted and therefore does not store enchantments under {@value #ENCHANTMENTS_KEY} key. + COMMENT enchanted and therefore does not store enchantments under {@link + COMMENT net.minecraft.component.DataComponentTypes#ENCHANTMENTS}. COMMENT - COMMENT @see #getEnchantments + COMMENT @see net.minecraft.enchantment.EnchantmentHelper#getEnchantments METHOD method_7945 getFrame ()Lnet/minecraft/class_1533; COMMENT {@return the item frame that holds the stack, or {@code null} if inapplicable} COMMENT @@ -451,13 +411,12 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack METHOD method_7963 isDamageable ()Z COMMENT {@return whether the item can be damaged (lose durability)} COMMENT - COMMENT

Items with {@linkplain Item#getMaxDamage 0 max damage} or item stacks with {@value - COMMENT #UNBREAKABLE_KEY} NBT set to {@code 1b} cannot be damaged. + COMMENT

Items with {@linkplain Item#getMaxDamage 0 max damage} or item stacks with {@link + COMMENT net.minecraft.component.DataComponentTypes#UNBREAKABLE} component cannot be damaged. COMMENT COMMENT @see Item#getMaxDamage COMMENT @see #isDamaged COMMENT @see #getDamage - COMMENT @see #isUnbreakable METHOD method_7964 getName ()Lnet/minecraft/class_2561; COMMENT {@return the custom name of the stack if it exists, or the item's name} METHOD method_7965 getBobbingAnimationTime ()I @@ -531,7 +490,8 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT Enchants this item with the given enchantment and level. COMMENT COMMENT

This should not be used with enchanted books, as the book itself is not - COMMENT enchanted and therefore does not store enchantments under {@value #ENCHANTMENTS_KEY} key. + COMMENT enchanted and therefore does not store enchantments under {@link + COMMENT net.minecraft.component.DataComponentTypes#ENCHANTMENTS}. COMMENT COMMENT @see net.minecraft.enchantment.EnchantmentHelper ARG 1 enchantment diff --git a/mappings/net/minecraft/loot/LootTable.mapping b/mappings/net/minecraft/loot/LootTable.mapping index 59a6854e85..53ce6695c8 100644 --- a/mappings/net/minecraft/loot/LootTable.mapping +++ b/mappings/net/minecraft/loot/LootTable.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_52 net/minecraft/loot/LootTable FIELD field_44892 randomSequenceId Ljava/util/Optional; FIELD field_45796 CODEC Lcom/mojang/serialization/Codec; + FIELD field_49428 DEFAULT_SEED J FIELD field_942 type Lnet/minecraft/class_176; FIELD field_943 pools Ljava/util/List; FIELD field_944 functions Ljava/util/List; diff --git a/mappings/net/minecraft/loot/context/LootContextTypes.mapping b/mappings/net/minecraft/loot/context/LootContextTypes.mapping index 7a19a3b8fc..153e3b10d4 100644 --- a/mappings/net/minecraft/loot/context/LootContextTypes.mapping +++ b/mappings/net/minecraft/loot/context/LootContextTypes.mapping @@ -23,6 +23,8 @@ CLASS net/minecraft/class_173 net/minecraft/loot/context/LootContextTypes ARG 0 builder METHOD method_56818 (Lnet/minecraft/class_176$class_177;)V ARG 0 builder + METHOD method_57660 (Lnet/minecraft/class_176$class_177;)V + ARG 0 builder METHOD method_755 (Lnet/minecraft/class_176$class_177;)V ARG 0 builder METHOD method_756 (Lnet/minecraft/class_176$class_177;)V diff --git a/mappings/net/minecraft/loot/entry/LootTableEntry.mapping b/mappings/net/minecraft/loot/entry/LootTableEntry.mapping index 9fb3898da9..e56a43cfca 100644 --- a/mappings/net/minecraft/loot/entry/LootTableEntry.mapping +++ b/mappings/net/minecraft/loot/entry/LootTableEntry.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_83 net/minecraft/loot/entry/LootTableEntry FIELD field_45803 CODEC Lcom/mojang/serialization/Codec; + FIELD field_49429 value Lcom/mojang/datafixers/util/Either; METHOD (Lcom/mojang/datafixers/util/Either;IILjava/util/List;Ljava/util/List;)V + ARG 1 value ARG 2 weight ARG 3 quality ARG 4 conditions @@ -12,7 +14,24 @@ CLASS net/minecraft/class_83 net/minecraft/loot/entry/LootTableEntry ARG 2 quality ARG 3 conditions ARG 4 functions + METHOD method_51222 (Lnet/minecraft/class_58;Lnet/minecraft/class_52;)V + ARG 1 table + METHOD method_51223 (Lnet/minecraft/class_58;Lnet/minecraft/class_2960;)V + ARG 1 id METHOD method_53293 (Lnet/minecraft/class_83;)Lcom/mojang/datafixers/util/Either; ARG 0 entry METHOD method_53294 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_57630 (Lnet/minecraft/class_47;Lnet/minecraft/class_2960;)Lnet/minecraft/class_52; + ARG 1 id + METHOD method_57631 builder (Lnet/minecraft/class_52;)Lnet/minecraft/class_85$class_86; + ARG 0 table + METHOD method_57632 (Lnet/minecraft/class_52;IILjava/util/List;Ljava/util/List;)Lnet/minecraft/class_85; + ARG 1 weight + ARG 2 quality + ARG 3 conditions + ARG 4 functions + METHOD method_57633 (Lnet/minecraft/class_58;Lnet/minecraft/class_2960;Lnet/minecraft/class_8488;Lnet/minecraft/class_52;)V + ARG 3 table + METHOD method_57634 (Lnet/minecraft/class_52;)Lnet/minecraft/class_52; + ARG 0 table diff --git a/mappings/net/minecraft/loot/function/CopyComponentsLootFunction.mapping b/mappings/net/minecraft/loot/function/CopyComponentsLootFunction.mapping new file mode 100644 index 0000000000..070141e64c --- /dev/null +++ b/mappings/net/minecraft/loot/function/CopyComponentsLootFunction.mapping @@ -0,0 +1,31 @@ +CLASS net/minecraft/class_9317 net/minecraft/loot/function/CopyComponentsLootFunction + FIELD field_49430 CODEC Lcom/mojang/serialization/Codec; + FIELD field_49431 source Lnet/minecraft/class_9317$class_9319; + FIELD field_49432 components Ljava/util/List; + METHOD (Ljava/util/List;Lnet/minecraft/class_9317$class_9319;Ljava/util/List;)V + ARG 1 conditions + ARG 2 source + ARG 3 components + METHOD method_57637 builder (Lnet/minecraft/class_9317$class_9319;)Lnet/minecraft/class_9317$class_9318; + ARG 0 source + METHOD method_57638 (Lnet/minecraft/class_9317;)Ljava/util/List; + ARG 0 function + METHOD method_57639 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_57640 (Lnet/minecraft/class_9317;)Lnet/minecraft/class_9317$class_9319; + ARG 0 function + CLASS class_9318 Builder + FIELD field_49434 source Lnet/minecraft/class_9317$class_9319; + FIELD field_49435 types Lcom/google/common/collect/ImmutableList$Builder; + METHOD (Lnet/minecraft/class_9317$class_9319;)V + ARG 1 source + METHOD method_57642 add (Lnet/minecraft/class_9331;)Lnet/minecraft/class_9317$class_9318; + ARG 1 type + CLASS class_9319 Source + FIELD field_49437 CODEC Lcom/mojang/serialization/Codec; + FIELD field_49438 id Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 id + METHOD method_57643 getRequiredParameters ()Ljava/util/Set; + METHOD method_57644 getComponents (Lnet/minecraft/class_47;)Lnet/minecraft/class_9323; + ARG 1 context diff --git a/mappings/net/minecraft/loot/function/CopyStateFunction.mapping b/mappings/net/minecraft/loot/function/CopyStateFunction.mapping index 7b2275cdfa..e3cbcef49b 100644 --- a/mappings/net/minecraft/loot/function/CopyStateFunction.mapping +++ b/mappings/net/minecraft/loot/function/CopyStateFunction.mapping @@ -18,6 +18,8 @@ CLASS net/minecraft/class_4488 net/minecraft/loot/function/CopyStateFunction ARG 0 instance METHOD method_53312 (Lnet/minecraft/class_4488;)Lnet/minecraft/class_6880; ARG 0 function + METHOD method_57636 (Lnet/minecraft/class_2680;Lnet/minecraft/class_9275;)Lnet/minecraft/class_9275; + ARG 2 component CLASS class_4489 Builder FIELD field_20451 block Lnet/minecraft/class_6880; FIELD field_20452 properties Lcom/google/common/collect/ImmutableSet$Builder; diff --git a/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping b/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping index 9902ad1860..85f31c35dc 100644 --- a/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping @@ -16,6 +16,8 @@ CLASS net/minecraft/class_137 net/minecraft/loot/function/SetAttributesLootFunct ARG 0 function METHOD method_53356 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_57647 (Lnet/minecraft/class_47;Lnet/minecraft/class_9285;)Lnet/minecraft/class_9285; + ARG 2 component CLASS class_138 Attribute FIELD comp_1859 name Ljava/lang/String; FIELD comp_1860 attribute Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/loot/function/SetBannerPatternFunction.mapping b/mappings/net/minecraft/loot/function/SetBannerPatternFunction.mapping index 318b12d51b..d6feeb91e3 100644 --- a/mappings/net/minecraft/loot/function/SetBannerPatternFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetBannerPatternFunction.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_5592 net/minecraft/loot/function/SetBannerPatternFunct FIELD field_45839 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/List;Lnet/minecraft/class_9307;Z)V ARG 1 conditions + ARG 2 patterns ARG 3 append METHOD method_35531 builder (Z)Lnet/minecraft/class_5592$class_6157; ARG 0 append @@ -13,6 +14,9 @@ CLASS net/minecraft/class_5592 net/minecraft/loot/function/SetBannerPatternFunct ARG 0 instance METHOD method_53362 (Lnet/minecraft/class_5592;)Lnet/minecraft/class_9307; ARG 0 function + METHOD method_57648 (Lnet/minecraft/class_9307;Lnet/minecraft/class_9307;)Lnet/minecraft/class_9307; + ARG 0 current + ARG 1 newPatterns CLASS class_6157 Builder FIELD field_31862 patterns Lnet/minecraft/class_9307$class_3750; FIELD field_31863 append Z diff --git a/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping b/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping index 439b4e1add..87787b8318 100644 --- a/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping @@ -12,6 +12,8 @@ CLASS net/minecraft/class_134 net/minecraft/loot/function/SetContentsLootFunctio ARG 0 instance METHOD method_53365 (Lnet/minecraft/class_134;)Lnet/minecraft/class_6880; ARG 0 function + METHOD method_57653 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;)V + ARG 1 nbt METHOD method_599 (Lnet/minecraft/class_47;Lnet/minecraft/class_2371;Lnet/minecraft/class_79;)V ARG 2 entry METHOD method_600 (Lnet/minecraft/class_47;Lnet/minecraft/class_2371;Lnet/minecraft/class_82;)V diff --git a/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping b/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping index a51ae0a46e..4d8c9c89e3 100644 --- a/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping @@ -17,6 +17,11 @@ CLASS net/minecraft/class_5642 net/minecraft/loot/function/SetEnchantmentsLootFu ARG 0 instance METHOD method_53372 (Lnet/minecraft/class_5642;)Ljava/util/Map; ARG 0 function + METHOD method_57656 (Lnet/minecraft/class_9304$class_9305;Lnet/minecraft/class_1887;Ljava/lang/Integer;)V + ARG 1 enchantment + ARG 2 level + METHOD method_57657 (Lit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/class_9304$class_9305;)V + ARG 2 builder CLASS class_6158 Builder FIELD field_31864 enchantments Lcom/google/common/collect/ImmutableMap$Builder; FIELD field_31865 add Z diff --git a/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping b/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping index a4f2d2682f..d7b2548b70 100644 --- a/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping @@ -19,6 +19,11 @@ CLASS net/minecraft/class_3671 net/minecraft/loot/function/SetLoreLootFunction ARG 0 function METHOD method_53385 (Lnet/minecraft/class_3671;)Ljava/lang/Boolean; ARG 0 function + METHOD method_57658 getNewLoreTexts (Lnet/minecraft/class_9290;Lnet/minecraft/class_47;)Ljava/util/List; + ARG 1 current + ARG 2 context + METHOD method_57659 (Lnet/minecraft/class_47;Lnet/minecraft/class_9290;)Lnet/minecraft/class_9290; + ARG 2 component CLASS class_6159 Builder FIELD field_31866 replace Z FIELD field_31867 target Ljava/util/Optional; diff --git a/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping b/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping index b4fdaedc36..6c7fe9102f 100644 --- a/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping @@ -8,5 +8,9 @@ CLASS net/minecraft/class_159 net/minecraft/loot/function/SetNbtLootFunction ARG 0 function METHOD method_53392 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_57654 builder (Lnet/minecraft/class_2487;)Lnet/minecraft/class_120$class_121; + ARG 0 nbt + METHOD method_57655 (Lnet/minecraft/class_2487;)V + ARG 1 nbt METHOD method_675 (Lnet/minecraft/class_2487;Ljava/util/List;)Lnet/minecraft/class_117; ARG 1 conditions diff --git a/mappings/net/minecraft/network/PacketByteBuf.mapping b/mappings/net/minecraft/network/PacketByteBuf.mapping index 5fdb921f82..19fc2fe2b7 100644 --- a/mappings/net/minecraft/network/PacketByteBuf.mapping +++ b/mappings/net/minecraft/network/PacketByteBuf.mapping @@ -72,15 +72,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT {@link UUID}{@link #readUuid()}{@link #writeUuid(UUID)} COMMENT COMMENT - COMMENT {@index GameProfile}{@link #readGameProfile()}{@link #writeGameProfile(GameProfile)} - COMMENT - COMMENT - COMMENT {@index Property}{@link #readProperty()}{@link #writeProperty(Property)} - COMMENT - COMMENT - COMMENT {@index PropertyMap}{@link #readPropertyMap()}{@link #writePropertyMap(PropertyMap)} - COMMENT - COMMENT COMMENT {@link NbtCompound}{@link #readNbt()}{@link #writeNbt(NbtCompound)} COMMENT COMMENT @@ -116,9 +107,6 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf COMMENT COMMENT Nullable value{@link #readNullable(PacketByteBuf.PacketReader)}{@link #writeNullable(Object, PacketByteBuf.PacketWriter)} COMMENT - COMMENT - COMMENT {@index Either}{@link #readEither(PacketByteBuf.PacketReader, PacketByteBuf.PacketReader)}{@link #writeEither(Either, PacketByteBuf.PacketWriter, PacketByteBuf.PacketWriter)} - COMMENT COMMENT COMMENT COMMENT

All {@code read} and {@code write} methods throw {@link diff --git a/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping index 1315e4f2e2..f125514e91 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_2797 net/minecraft/network/packet/c2s/play/ChatMessage COMMENT 256 characters, it will reject the message and disconnect the client. COMMENT COMMENT

If the message contains an invalid character (see {@link - COMMENT net.minecraft.SharedConstants#isValidChar}) or if the server + COMMENT net.minecraft.util.StringHelper#isValidChar}) or if the server COMMENT receives the messages in improper order. the server will COMMENT reject the message and disconnect the client. COMMENT diff --git a/mappings/net/minecraft/network/packet/c2s/play/CommandExecutionC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/CommandExecutionC2SPacket.mapping index ac9b9d95e1..fec7d1556e 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/CommandExecutionC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/CommandExecutionC2SPacket.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_7472 net/minecraft/network/packet/c2s/play/CommandExec COMMENT it will reject the message and disconnect the client. COMMENT COMMENT

If the command contains an invalid character (see {@link - COMMENT net.minecraft.SharedConstants#isValidChar}) or if the server receives + COMMENT net.minecraft.util.StringHelper#isValidChar}) or if the server receives COMMENT the commands in improper order, the server will reject the command and disconnect COMMENT the client. COMMENT diff --git a/mappings/net/minecraft/potion/Potion.mapping b/mappings/net/minecraft/potion/Potion.mapping index e3f25622eb..64befb8a88 100644 --- a/mappings/net/minecraft/potion/Potion.mapping +++ b/mappings/net/minecraft/potion/Potion.mapping @@ -6,7 +6,10 @@ CLASS net/minecraft/class_1842 net/minecraft/potion/Potion ARG 2 effects METHOD ([Lnet/minecraft/class_1293;)V ARG 1 effects + METHOD method_57396 (Lnet/minecraft/class_5321;)Ljava/lang/String; + ARG 0 key METHOD method_8049 getEffects ()Ljava/util/List; METHOD method_8050 hasInstantEffect ()Z METHOD method_8051 finishTranslationKey (Ljava/util/Optional;Ljava/lang/String;)Ljava/lang/String; + ARG 0 potion ARG 1 prefix diff --git a/mappings/net/minecraft/registry/RegistryOps.mapping b/mappings/net/minecraft/registry/RegistryOps.mapping index fc805f9d24..a97361398b 100644 --- a/mappings/net/minecraft/registry/RegistryOps.mapping +++ b/mappings/net/minecraft/registry/RegistryOps.mapping @@ -34,6 +34,8 @@ CLASS net/minecraft/class_6903 net/minecraft/registry/RegistryOps METHOD method_56622 withRegistry (Lcom/mojang/serialization/Dynamic;Lnet/minecraft/class_7225$class_7874;)Lcom/mojang/serialization/Dynamic; ARG 0 dynamic ARG 1 registryLookup + METHOD method_57110 withDelegate (Lcom/mojang/serialization/DynamicOps;)Lnet/minecraft/class_6903; + ARG 1 delegate CLASS 1 FIELD field_40854 registryRefToInfo Ljava/util/Map; CLASS 2 diff --git a/mappings/net/minecraft/scoreboard/Scoreboard.mapping b/mappings/net/minecraft/scoreboard/Scoreboard.mapping index 8897ce3b14..1a1a5e4f4c 100644 --- a/mappings/net/minecraft/scoreboard/Scoreboard.mapping +++ b/mappings/net/minecraft/scoreboard/Scoreboard.mapping @@ -44,6 +44,7 @@ CLASS net/minecraft/class_269 net/minecraft/scoreboard/Scoreboard ARG 5 displayAutoUpdate ARG 6 numberFormat METHOD method_1169 toNbt (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2499; + ARG 1 registries METHOD method_1170 getNullableObjective (Ljava/lang/String;)Lnet/minecraft/class_266; ARG 1 name METHOD method_1171 addTeam (Ljava/lang/String;)Lnet/minecraft/class_268; @@ -60,6 +61,8 @@ CLASS net/minecraft/class_269 net/minecraft/scoreboard/Scoreboard ARG 2 objective ARG 3 score METHOD method_1178 getKnownScoreHolders ()Ljava/util/Collection; + METHOD method_1179 (Ljava/lang/Object;)Ljava/util/List; + ARG 0 criterion2 METHOD method_1180 getOrCreateScore (Lnet/minecraft/class_9015;Lnet/minecraft/class_266;)Lnet/minecraft/class_9014; ARG 1 scoreHolder ARG 2 objective @@ -71,6 +74,7 @@ CLASS net/minecraft/class_269 net/minecraft/scoreboard/Scoreboard ARG 1 objective METHOD method_1188 readNbt (Lnet/minecraft/class_2499;Lnet/minecraft/class_7225$class_7874;)V ARG 1 list + ARG 2 registries METHOD method_1189 getObjectiveForSlot (Lnet/minecraft/class_8646;)Lnet/minecraft/class_266; ARG 1 slot METHOD method_1190 onScoreRemoved (Lnet/minecraft/class_9015;Lnet/minecraft/class_266;)V @@ -95,6 +99,14 @@ CLASS net/minecraft/class_269 net/minecraft/scoreboard/Scoreboard ARG 1 scoreHolder ARG 2 objective ARG 3 forceWritable + METHOD method_55426 (Lnet/minecraft/class_7225$class_7874;Ljava/lang/String;Lnet/minecraft/class_2499;Lnet/minecraft/class_266;Lnet/minecraft/class_267;)V + ARG 3 objective + ARG 4 score + METHOD method_55427 (Lorg/apache/commons/lang3/mutable/MutableBoolean;Lnet/minecraft/class_267;)V + ARG 1 score + METHOD method_55428 (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_2499;Ljava/lang/String;Lnet/minecraft/class_9012;)V + ARG 2 name + ARG 3 scores METHOD method_55429 removeScores (Lnet/minecraft/class_9015;)V ARG 1 scoreHolder METHOD method_55430 getScore (Lnet/minecraft/class_9015;Lnet/minecraft/class_266;)Lnet/minecraft/class_9013; @@ -102,6 +114,8 @@ CLASS net/minecraft/class_269 net/minecraft/scoreboard/Scoreboard ARG 2 objective METHOD method_55431 getScores (Ljava/lang/String;)Lnet/minecraft/class_9012; ARG 1 scoreHolderName + METHOD method_55432 (Ljava/lang/String;)Lnet/minecraft/class_9012; + ARG 0 name CLASS 1 METHOD method_55433 setLocked (Z)V ARG 1 locked diff --git a/mappings/net/minecraft/scoreboard/ScoreboardScore.mapping b/mappings/net/minecraft/scoreboard/ScoreboardScore.mapping index d59fe42335..254af9d8d0 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardScore.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardScore.mapping @@ -15,6 +15,7 @@ CLASS net/minecraft/class_267 net/minecraft/scoreboard/ScoreboardScore ARG 1 format METHOD method_55403 fromNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_267; ARG 0 nbt + ARG 1 registries METHOD method_55404 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V ARG 1 formatElement METHOD method_55405 setDisplayText (Lnet/minecraft/class_2561;)V @@ -23,3 +24,4 @@ CLASS net/minecraft/class_267 net/minecraft/scoreboard/ScoreboardScore ARG 1 numberFormat METHOD method_55407 getDisplayText ()Lnet/minecraft/class_2561; METHOD method_55408 toNbt (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487; + ARG 1 registries diff --git a/mappings/net/minecraft/scoreboard/ScoreboardState.mapping b/mappings/net/minecraft/scoreboard/ScoreboardState.mapping index 4e50545319..bda7c1043d 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardState.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardState.mapping @@ -8,14 +8,19 @@ CLASS net/minecraft/class_273 net/minecraft/scoreboard/ScoreboardState ARG 1 team ARG 2 nbt METHOD method_1216 objectivesToNbt (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2499; + ARG 1 registries METHOD method_1217 teamsToNbt (Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2499; + ARG 1 registries METHOD method_1219 readTeamsNbt (Lnet/minecraft/class_2499;Lnet/minecraft/class_7225$class_7874;)V ARG 1 nbt + ARG 2 registries METHOD method_1220 readObjectivesNbt (Lnet/minecraft/class_2499;Lnet/minecraft/class_7225$class_7874;)V ARG 1 nbt + ARG 2 registries METHOD method_1221 readDisplaySlotsNbt (Lnet/minecraft/class_2487;)V ARG 1 nbt METHOD method_1222 writeDisplaySlotsNbt (Lnet/minecraft/class_2487;)V ARG 1 nbt METHOD method_32481 readNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_273; ARG 1 nbt + ARG 2 registries diff --git a/mappings/net/minecraft/scoreboard/Scores.mapping b/mappings/net/minecraft/scoreboard/Scores.mapping index 6fe5462c59..ac3ff37a3f 100644 --- a/mappings/net/minecraft/scoreboard/Scores.mapping +++ b/mappings/net/minecraft/scoreboard/Scores.mapping @@ -12,6 +12,8 @@ CLASS net/minecraft/class_9012 net/minecraft/scoreboard/Scores METHOD method_55392 (Lit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/class_266;Lnet/minecraft/class_267;)V ARG 1 objective ARG 2 score + METHOD method_55393 (Ljava/util/function/Consumer;Ljava/lang/Object;)Lnet/minecraft/class_267; + ARG 1 objective2 METHOD method_55394 getScoresAsIntMap ()Lit/unimi/dsi/fastutil/objects/Object2IntMap; METHOD method_55395 remove (Lnet/minecraft/class_266;)Z ARG 1 objective diff --git a/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping b/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping index 01e39c06ae..454bc19613 100644 --- a/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping +++ b/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping @@ -20,6 +20,8 @@ CLASS net/minecraft/class_3803 net/minecraft/screen/GrindstoneScreenHandler ARG 1 item ARG 2 damage ARG 3 amount + METHOD method_16694 (Lnet/minecraft/class_9304$class_9305;)V + ARG 0 builder METHOD method_16695 updateResult ()V METHOD method_17415 (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 2 world @@ -27,6 +29,10 @@ CLASS net/minecraft/class_3803 net/minecraft/screen/GrindstoneScreenHandler METHOD method_20268 transferEnchantments (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; ARG 1 target ARG 2 source + METHOD method_57320 (Lnet/minecraft/class_1799;Lnet/minecraft/class_9304$class_9305;)V + ARG 1 builder + METHOD method_57321 (Lnet/minecraft/class_6880;)Z + ARG 0 enchantment CLASS 4 METHOD method_16696 getExperience (Lnet/minecraft/class_1799;)I ARG 1 stack diff --git a/mappings/net/minecraft/screen/LoomScreenHandler.mapping b/mappings/net/minecraft/screen/LoomScreenHandler.mapping index d99e8aa508..f3f40f3d7a 100644 --- a/mappings/net/minecraft/screen/LoomScreenHandler.mapping +++ b/mappings/net/minecraft/screen/LoomScreenHandler.mapping @@ -36,6 +36,8 @@ CLASS net/minecraft/class_1726 net/minecraft/screen/LoomScreenHandler METHOD method_43706 getBannerPatterns ()Ljava/util/List; METHOD method_45016 isPatternIndexValid (I)Z ARG 1 index + METHOD method_57322 (Lnet/minecraft/class_6880;Lnet/minecraft/class_1767;Lnet/minecraft/class_9307;)Lnet/minecraft/class_9307; + ARG 2 component METHOD method_7647 getSelectedPattern ()I METHOD method_7648 updateOutputSlot (Lnet/minecraft/class_6880;)V ARG 1 pattern diff --git a/mappings/net/minecraft/screen/MerchantScreenHandler.mapping b/mappings/net/minecraft/screen/MerchantScreenHandler.mapping index 7666ba486e..da32b8c2a5 100644 --- a/mappings/net/minecraft/screen/MerchantScreenHandler.mapping +++ b/mappings/net/minecraft/screen/MerchantScreenHandler.mapping @@ -44,5 +44,7 @@ CLASS net/minecraft/class_1728 net/minecraft/screen/MerchantScreenHandler METHOD method_20700 setCanRefreshTrades (Z)V ARG 1 canRefreshTrades METHOD method_20701 canRefreshTrades ()Z + METHOD method_57323 (Lnet/minecraft/class_9306;)V + ARG 1 item METHOD method_7650 setRecipeIndex (I)V ARG 1 index diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index db033a7f7a..3d9ca42019 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -462,6 +462,10 @@ CLASS net/minecraft/server/MinecraftServer ARG 1 player ARG 2 type METHOD method_56626 shouldPushTickTimeLog ()Z + METHOD method_57821 onChunkLoadFailure (Lnet/minecraft/class_1923;)V + ARG 1 pos + METHOD method_57822 onChunkSaveFailure (Lnet/minecraft/class_1923;)V + ARG 1 pos CLASS class_6414 DebugStart FIELD field_33980 time J FIELD field_33981 tick I diff --git a/mappings/net/minecraft/server/command/PlaySoundCommand.mapping b/mappings/net/minecraft/server/command/PlaySoundCommand.mapping index c8064f8439..22eab30242 100644 --- a/mappings/net/minecraft/server/command/PlaySoundCommand.mapping +++ b/mappings/net/minecraft/server/command/PlaySoundCommand.mapping @@ -25,3 +25,9 @@ CLASS net/minecraft/class_3091 net/minecraft/server/command/PlaySoundCommand ARG 7 minVolume METHOD method_13505 (Lnet/minecraft/class_3419;Lcom/mojang/brigadier/context/CommandContext;)I ARG 1 context + METHOD method_57111 toList (Lnet/minecraft/class_3222;)Ljava/util/Collection; + ARG 0 player + METHOD method_57112 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_57113 (Lnet/minecraft/class_3419;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 1 context diff --git a/mappings/net/minecraft/server/command/ResetChunksCommand.mapping b/mappings/net/minecraft/server/command/ResetChunksCommand.mapping index 868ba6fe06..7788d212ba 100644 --- a/mappings/net/minecraft/server/command/ResetChunksCommand.mapping +++ b/mappings/net/minecraft/server/command/ResetChunksCommand.mapping @@ -16,3 +16,7 @@ CLASS net/minecraft/class_6608 net/minecraft/server/command/ResetChunksCommand ARG 0 context METHOD method_39500 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context + METHOD method_57114 (Lnet/minecraft/class_2806;Lnet/minecraft/class_2791;)Lcom/mojang/datafixers/util/Unit; + ARG 1 chunk + METHOD method_57115 (Lnet/minecraft/class_2806;Lnet/minecraft/class_9312;Lnet/minecraft/class_3846;Ljava/util/List;Lcom/mojang/datafixers/util/Unit;)Ljava/util/concurrent/CompletionStage; + ARG 4 unit diff --git a/mappings/net/minecraft/server/command/TestCommand.mapping b/mappings/net/minecraft/server/command/TestCommand.mapping index 80f4a9035e..35e0d9b220 100644 --- a/mappings/net/minecraft/server/command/TestCommand.mapping +++ b/mappings/net/minecraft/server/command/TestCommand.mapping @@ -136,6 +136,10 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand ARG 1 pos METHOD method_57106 (Lnet/minecraft/class_1297;)V ARG 0 entity + METHOD method_57963 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_57964 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context CLASS class_4528 Listener FIELD comp_2216 world Lnet/minecraft/class_3218; FIELD comp_2217 tests Lnet/minecraft/class_4524; diff --git a/mappings/net/minecraft/server/command/TestFinder.mapping b/mappings/net/minecraft/server/command/TestFinder.mapping index 00b7ca740e..339ed7e57a 100644 --- a/mappings/net/minecraft/server/command/TestFinder.mapping +++ b/mappings/net/minecraft/server/command/TestFinder.mapping @@ -14,8 +14,14 @@ CLASS net/minecraft/class_9123 net/minecraft/server/command/TestFinder METHOD method_56306 createRunner ()Ljava/lang/Object; CLASS class_9124 Runners FIELD field_48513 runnerFactory Ljava/util/function/Function; + FIELD field_49663 testFunctionsSupplierMapper Ljava/util/function/UnaryOperator; + FIELD field_49664 structurePosSupplierMapper Ljava/util/function/UnaryOperator; METHOD (Ljava/util/function/Function;)V ARG 1 runnerFactory + METHOD (Ljava/util/function/Function;Ljava/util/function/UnaryOperator;Ljava/util/function/UnaryOperator;)V + ARG 1 runnerFactory + ARG 2 testFunctionsSupplierMapper + ARG 3 structurePosSupplierMapper METHOD method_56309 nearest (Lcom/mojang/brigadier/context/CommandContext;)Ljava/lang/Object; ARG 1 context METHOD method_56310 surface (Lcom/mojang/brigadier/context/CommandContext;I)Ljava/lang/Object; @@ -40,3 +46,17 @@ CLASS net/minecraft/class_9123 net/minecraft/server/command/TestFinder ARG 1 context METHOD method_56324 failed (Lcom/mojang/brigadier/context/CommandContext;)Ljava/lang/Object; ARG 1 context + METHOD method_57965 repeat (I)Lnet/minecraft/class_9123$class_9124; + ARG 1 count + METHOD method_57966 (ILjava/util/function/Supplier;)Ljava/util/function/Supplier; + ARG 1 supplier + METHOD method_57967 createRunner (Lnet/minecraft/class_2168;Lnet/minecraft/class_9125;Lnet/minecraft/class_9119;)Ljava/lang/Object; + ARG 1 source + ARG 2 testFunctionFinder + ARG 3 structureBlockFinder + METHOD method_57968 (Ljava/util/function/Supplier;)Ljava/util/function/Supplier; + ARG 0 structurePosSupplier + METHOD method_57970 repeating (I)Ljava/util/function/UnaryOperator; + ARG 0 count + METHOD method_57971 (Ljava/util/function/Supplier;)Ljava/util/function/Supplier; + ARG 0 testFunctionsSupplier diff --git a/mappings/net/minecraft/server/integrated/IntegratedServer.mapping b/mappings/net/minecraft/server/integrated/IntegratedServer.mapping index d0630a78ff..d8cfccf891 100644 --- a/mappings/net/minecraft/server/integrated/IntegratedServer.mapping +++ b/mappings/net/minecraft/server/integrated/IntegratedServer.mapping @@ -22,3 +22,4 @@ CLASS net/minecraft/class_1132 net/minecraft/server/integrated/IntegratedServer ARG 1 keyPair METHOD method_4817 setLocalPlayerUuid (Ljava/util/UUID;)V ARG 1 localPlayerUuid + METHOD method_57823 checkLowDiskSpaceWarning ()V diff --git a/mappings/net/minecraft/server/integrated/IntegratedServerLoader.mapping b/mappings/net/minecraft/server/integrated/IntegratedServerLoader.mapping index 14716bf5ec..fcbfe80b23 100644 --- a/mappings/net/minecraft/server/integrated/IntegratedServerLoader.mapping +++ b/mappings/net/minecraft/server/integrated/IntegratedServerLoader.mapping @@ -60,6 +60,57 @@ CLASS net/minecraft/class_7196 net/minecraft/server/integrated/IntegratedServerL METHOD method_55510 applyWorldPack (Lnet/minecraft/class_1066;Lnet/minecraft/class_32$class_5143;)Ljava/util/concurrent/CompletableFuture; ARG 1 loader ARG 2 session + METHOD method_57773 start (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_6904;Lnet/minecraft/class_3283;)V + ARG 1 session + ARG 2 saveLoader + ARG 3 dataPackManager + METHOD method_57774 (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_6904;Lnet/minecraft/class_3283;Lnet/minecraft/class_1066;Ljava/lang/Runnable;Z)V + ARG 6 confirmed + METHOD method_57775 checkBackupAndStart (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_6904;Lnet/minecraft/class_3283;Ljava/lang/Runnable;)V + ARG 1 session + ARG 2 saveLoader + ARG 3 dataPackManager + ARG 4 onCancel + METHOD method_57776 start (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_6904;Lnet/minecraft/class_1066;Lnet/minecraft/class_3283;Ljava/lang/Runnable;)V + ARG 1 session + ARG 2 saveLoader + ARG 3 resourcePackLoader + ARG 4 dataPackManager + ARG 5 onCancel + METHOD method_57777 (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_6904;Lnet/minecraft/class_1066;Lnet/minecraft/class_3283;Ljava/lang/Runnable;Ljava/lang/Boolean;)V + ARG 6 successful + METHOD method_57779 (Lnet/minecraft/class_32$class_5143;Lcom/mojang/serialization/Dynamic;Ljava/lang/Runnable;ZZ)V + ARG 4 backup + ARG 5 eraseCache + METHOD method_57780 start (Lnet/minecraft/class_32$class_5143;Lcom/mojang/serialization/Dynamic;ZLjava/lang/Runnable;)V + ARG 1 session + ARG 2 levelProperties + ARG 3 safeMode + ARG 4 onCancel + METHOD method_57781 start (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_34;Lcom/mojang/serialization/Dynamic;Ljava/lang/Runnable;)V + ARG 1 session + ARG 2 summary + ARG 3 levelProperties + ARG 4 onCancel + METHOD method_57782 start (Lnet/minecraft/class_32$class_5143;Ljava/lang/Runnable;)V + ARG 1 session + ARG 2 onCancel + METHOD method_57783 (Lnet/minecraft/class_32$class_5143;Ljava/lang/Runnable;Z)V + ARG 3 confirmed + METHOD method_57784 start (Ljava/lang/String;Ljava/lang/Runnable;)V + ARG 1 name + ARG 2 onCancel + METHOD method_57785 (Ljava/lang/Throwable;)Ljava/lang/Void; + ARG 1 throwable + METHOD method_57786 (Ljava/lang/Void;)Ljava/lang/Boolean; + ARG 0 v + METHOD method_57787 start (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_6904;Lnet/minecraft/class_3283;Ljava/lang/Runnable;)V + ARG 1 session + ARG 2 saveLoader + ARG 3 dataPackManager + ARG 4 onCancel + METHOD method_57789 (Ljava/lang/Throwable;)Ljava/util/concurrent/CompletionStage; + ARG 1 throwable CLASS class_7750 CurrentSettings FIELD comp_1031 levelInfo Lnet/minecraft/class_1940; FIELD comp_1033 existingDimensionRegistry Lnet/minecraft/class_2378; diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping index ee331933e1..1328fe3d32 100644 --- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping @@ -98,6 +98,7 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan METHOD method_31277 filterText (Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture; ARG 1 text METHOD method_31278 updateBookContent (Ljava/util/List;I)V + ARG 1 pages ARG 2 slotId METHOD method_31279 filterTexts (Ljava/util/List;)Ljava/util/concurrent/CompletableFuture; ARG 1 texts @@ -110,6 +111,8 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan ARG 1 filtered METHOD method_31285 (Lnet/minecraft/class_2877;Ljava/util/List;)V ARG 2 texts + METHOD method_33799 (Lnet/minecraft/class_5837;)Lnet/minecraft/class_9262; + ARG 1 page METHOD method_34882 clampHorizontal (D)D ARG 0 d METHOD method_34883 clampVertical (D)D @@ -169,6 +172,8 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan METHOD method_52415 cleanUp ()V METHOD method_56922 getMaxAllowedFloatingTicks (Lnet/minecraft/class_1297;)I ARG 1 vehicle + METHOD method_57142 toRawFilteredPair (Lnet/minecraft/class_5837;)Lnet/minecraft/class_9262; + ARG 1 message CLASS 1 METHOD method_33897 processInteract (Lnet/minecraft/class_1268;Lnet/minecraft/class_3244$class_5860;)V ARG 1 hand diff --git a/mappings/net/minecraft/server/world/ChunkHolder.mapping b/mappings/net/minecraft/server/world/ChunkHolder.mapping index 08093aeb65..046395ace3 100644 --- a/mappings/net/minecraft/server/world/ChunkHolder.mapping +++ b/mappings/net/minecraft/server/world/ChunkHolder.mapping @@ -107,6 +107,9 @@ CLASS net/minecraft/class_3193 net/minecraft/server/world/ChunkHolder ARG 1 postProcessingFuture METHOD method_53681 getPostProcessingFuture ()Ljava/util/concurrent/CompletableFuture; METHOD method_53682 getPostProcessedChunk ()Lnet/minecraft/class_2818; + METHOD method_57116 (Lnet/minecraft/class_2791;Lnet/minecraft/class_9259;)Lnet/minecraft/class_2791; + ARG 0 chunk + ARG 1 otherChunk CLASS class_3896 LevelUpdateListener METHOD method_17209 updateLevel (Lnet/minecraft/class_1923;Ljava/util/function/IntSupplier;ILjava/util/function/IntConsumer;)V ARG 1 pos diff --git a/mappings/net/minecraft/server/world/ChunkTicketManager.mapping b/mappings/net/minecraft/server/world/ChunkTicketManager.mapping index 4908fc5a03..d980aac4e2 100644 --- a/mappings/net/minecraft/server/world/ChunkTicketManager.mapping +++ b/mappings/net/minecraft/server/world/ChunkTicketManager.mapping @@ -75,6 +75,8 @@ CLASS net/minecraft/class_3204 net/minecraft/server/world/ChunkTicketManager ARG 2 pos ARG 3 radius ARG 4 argument + METHOD method_17642 (JLnet/minecraft/class_9259;)V + ARG 3 optionalChunk METHOD method_17645 removeTicket (JLnet/minecraft/class_3228;)V ARG 1 pos ARG 3 ticket diff --git a/mappings/net/minecraft/server/world/OptionalChunk.mapping b/mappings/net/minecraft/server/world/OptionalChunk.mapping new file mode 100644 index 0000000000..a094c3ef8a --- /dev/null +++ b/mappings/net/minecraft/server/world/OptionalChunk.mapping @@ -0,0 +1,22 @@ +CLASS net/minecraft/class_9259 net/minecraft/server/world/OptionalChunk + METHOD method_57122 isPresent ()Z + METHOD method_57123 orElse (Lnet/minecraft/class_9259;Ljava/lang/Object;)Ljava/lang/Object; + ARG 0 optionalChunk + ARG 1 other + METHOD method_57124 of (Ljava/lang/Object;)Lnet/minecraft/class_9259; + ARG 0 chunk + METHOD method_57125 of (Ljava/lang/String;)Lnet/minecraft/class_9259; + ARG 0 error + METHOD method_57126 ifPresent (Ljava/util/function/Consumer;)Lnet/minecraft/class_9259; + ARG 1 callback + METHOD method_57127 map (Ljava/util/function/Function;)Lnet/minecraft/class_9259; + ARG 1 mapper + METHOD method_57128 of (Ljava/util/function/Supplier;)Lnet/minecraft/class_9259; + ARG 0 error + METHOD method_57129 getError ()Ljava/lang/String; + METHOD method_57130 orElse (Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 other + METHOD method_57132 orElseThrow (Ljava/util/function/Supplier;)Ljava/lang/Object; + ARG 1 exceptionSupplier + CLASS class_9260 LoadFailure + CLASS class_9261 ActualChunk diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index bd3ca19026..c9bdf35229 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -36,6 +36,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld FIELD field_41751 THUNDER_WEATHER_DURATION_PROVIDER Lnet/minecraft/class_6017; FIELD field_44857 randomSequences Lnet/minecraft/class_8565; FIELD field_48271 spawnChunkRadius I + FIELD field_49172 pathNodeTypeCache Lnet/minecraft/class_9315; METHOD (Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_5268;Lnet/minecraft/class_5321;Lnet/minecraft/class_5363;Lnet/minecraft/class_3949;ZJLjava/util/List;ZLnet/minecraft/class_8565;)V ARG 1 server ARG 2 workerExecutor @@ -389,6 +390,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld METHOD method_52168 getRandomSequences ()Lnet/minecraft/class_8565; METHOD method_52370 tickIceAndSnow (Lnet/minecraft/class_2338;)V ARG 1 pos + METHOD method_57133 getPathNodeTypeCache ()Lnet/minecraft/class_9315; METHOD method_8448 updateSleepingPlayers ()V METHOD method_8487 locateStructure (Lnet/minecraft/class_6862;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338; COMMENT Tries to find the closest structure of a given type near a given block. diff --git a/mappings/net/minecraft/village/TradeOffer.mapping b/mappings/net/minecraft/village/TradeOffer.mapping index c663e53bac..8ac505efb0 100644 --- a/mappings/net/minecraft/village/TradeOffer.mapping +++ b/mappings/net/minecraft/village/TradeOffer.mapping @@ -15,12 +15,14 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer ARG 1 offer METHOD (Lnet/minecraft/class_9306;Ljava/util/Optional;Lnet/minecraft/class_1799;IIF)V ARG 1 firstBuyItem + ARG 2 secondBuyItem ARG 3 sellItem ARG 4 maxUses ARG 5 merchantExperience ARG 6 priceMultiplier METHOD (Lnet/minecraft/class_9306;Ljava/util/Optional;Lnet/minecraft/class_1799;IIIF)V ARG 1 firstBuyItem + ARG 2 secondBuyItem ARG 3 sellItem ARG 4 uses ARG 5 maxUses @@ -28,6 +30,7 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer ARG 7 priceMultiplier METHOD (Lnet/minecraft/class_9306;Ljava/util/Optional;Lnet/minecraft/class_1799;IIIFI)V ARG 1 firstBuyItem + ARG 2 secondBuyItem ARG 3 sellItem ARG 4 uses ARG 5 maxUses @@ -36,6 +39,7 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer ARG 8 demandBonus METHOD (Lnet/minecraft/class_9306;Ljava/util/Optional;Lnet/minecraft/class_1799;IIZIIFI)V ARG 1 firstBuyItem + ARG 2 secondBuyItem ARG 3 sellItem ARG 4 uses ARG 5 maxUses @@ -51,13 +55,14 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer ARG 4 merchantExperience ARG 5 priceMultiplier METHOD method_16952 matchesBuyItems (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z + ARG 1 stack ARG 2 buyItem METHOD method_16953 depleteBuyItems (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z ARG 1 firstBuyStack ARG 2 secondBuyStack METHOD method_18019 copySellItem ()Lnet/minecraft/class_1799; COMMENT Returns a copy of the sell item of this trade offer. - METHOD method_19272 getAdjustedFirstBuyItem ()Lnet/minecraft/class_1799; + METHOD method_19272 getDisplayedFirstBuyItem ()Lnet/minecraft/class_1799; COMMENT Returns a copy of the first buy item of this trade offer, COMMENT with its price adjusted depending on the demand bonus, the COMMENT special price and the price multiplier. @@ -125,6 +130,10 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer ARG 0 tradeOffer METHOD method_56716 (Lnet/minecraft/class_1914;)Lnet/minecraft/class_9306; ARG 0 tradeOffer + METHOD method_57555 getFirstBuyItemCount (Lnet/minecraft/class_9306;)I + ARG 1 firstBuyItem + METHOD method_57556 getFirstBuyItem ()Lnet/minecraft/class_9306; + METHOD method_57557 getSecondBuyItem ()Ljava/util/Optional; METHOD method_8244 use ()V COMMENT Increments the number of times this trade offer has been used. METHOD method_8245 increaseSpecialPrice (I)V @@ -134,7 +143,7 @@ CLASS net/minecraft/class_1914 net/minecraft/village/TradeOffer ARG 1 increment METHOD method_8246 getOriginalFirstBuyItem ()Lnet/minecraft/class_1799; COMMENT Returns the first buy item of this trade offer. - METHOD method_8247 getSecondBuyItem ()Lnet/minecraft/class_1799; + METHOD method_8247 getDisplayedSecondBuyItem ()Lnet/minecraft/class_1799; COMMENT Returns the second buy item of this trade offer. COMMENT COMMENT

If there is no second buy item, this returns the {@linkplain ItemStack#EMPTY empty diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping index 52741f9832..680e65bf80 100644 --- a/mappings/net/minecraft/village/TradeOffers.mapping +++ b/mappings/net/minecraft/village/TradeOffers.mapping @@ -37,6 +37,10 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 0 item ARG 1 enchantment ARG 2 level + METHOD method_57311 createPotion (Lnet/minecraft/class_6880;)Lnet/minecraft/class_9306; + ARG 0 potion + METHOD method_57312 (Lnet/minecraft/class_6880;Lnet/minecraft/class_9329$class_9330;)Lnet/minecraft/class_9329$class_9330; + ARG 1 builder CLASS class_1648 EnchantBookFactory FIELD field_18557 experience I FIELD field_45131 possibleEnchantments Ljava/util/List; @@ -168,8 +172,12 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 7 experience ARG 8 multiplier METHOD (Lnet/minecraft/class_9306;ILnet/minecraft/class_1799;IIF)V + ARG 1 toBeProcessed ARG 2 count + ARG 3 processed + ARG 4 maxUses ARG 5 processedCount + ARG 6 multiplier CLASS class_4165 SellItemFactory FIELD field_18571 sell Lnet/minecraft/class_1799; FIELD field_18572 price I @@ -222,6 +230,7 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 2 duration ARG 3 experience METHOD (Lnet/minecraft/class_9298;IF)V + ARG 1 stewEffects ARG 2 experience ARG 3 multiplier CLASS class_4167 SellPotionHoldingItemFactory diff --git a/mappings/net/minecraft/village/TradedItem.mapping b/mappings/net/minecraft/village/TradedItem.mapping new file mode 100644 index 0000000000..86e6b0d470 --- /dev/null +++ b/mappings/net/minecraft/village/TradedItem.mapping @@ -0,0 +1,23 @@ +CLASS net/minecraft/class_9306 net/minecraft/village/TradedItem + FIELD field_49393 CODEC Lcom/mojang/serialization/Codec; + FIELD field_49394 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_49395 OPTIONAL_PACKET_CODEC Lnet/minecraft/class_9139; + METHOD (Lnet/minecraft/class_1935;)V + ARG 1 item + METHOD (Lnet/minecraft/class_1935;I)V + ARG 1 item + ARG 2 count + METHOD (Lnet/minecraft/class_6880;ILnet/minecraft/class_9329;)V + ARG 1 item + ARG 2 count + ARG 3 components + METHOD method_57551 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_57552 matches (Lnet/minecraft/class_1799;)Z + ARG 1 stack + METHOD method_57553 createDisplayStack (Lnet/minecraft/class_6880;ILnet/minecraft/class_9329;)Lnet/minecraft/class_1799; + ARG 0 item + ARG 1 count + ARG 2 components + METHOD method_57554 withComponents (Ljava/util/function/UnaryOperator;)Lnet/minecraft/class_9306; + ARG 1 builderCallback diff --git a/mappings/net/minecraft/world/ChunkSerializer.mapping b/mappings/net/minecraft/world/ChunkSerializer.mapping index f9be226314..8ad618a882 100644 --- a/mappings/net/minecraft/world/ChunkSerializer.mapping +++ b/mappings/net/minecraft/world/ChunkSerializer.mapping @@ -72,3 +72,6 @@ CLASS net/minecraft/class_2852 net/minecraft/world/ChunkSerializer ARG 1 key METHOD method_39797 (Lnet/minecraft/class_2499;Lnet/minecraft/class_3218;Lnet/minecraft/class_2499;Lnet/minecraft/class_2818;)V ARG 3 chunk + CLASS class_9314 ChunkLoadingException + METHOD (Ljava/lang/String;)V + ARG 1 message diff --git a/mappings/net/minecraft/world/CommandBlockExecutor.mapping b/mappings/net/minecraft/world/CommandBlockExecutor.mapping index 96d8cb63a1..51209217e1 100644 --- a/mappings/net/minecraft/world/CommandBlockExecutor.mapping +++ b/mappings/net/minecraft/world/CommandBlockExecutor.mapping @@ -27,9 +27,14 @@ CLASS net/minecraft/class_1918 net/minecraft/world/CommandBlockExecutor ARG 1 lastOutput METHOD method_8292 getLastOutput ()Lnet/minecraft/class_2561; METHOD method_8293 getWorld ()Lnet/minecraft/class_3218; + METHOD method_8294 (ZI)V + ARG 1 successful + ARG 2 returnValue METHOD method_8295 markDirty ()V METHOD method_8296 isTrackingOutput ()Z METHOD method_8297 writeNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_2487; + ARG 1 nbt + ARG 2 registries METHOD method_8298 setSuccessCount (I)V ARG 1 successCount METHOD method_8299 getCustomName ()Lnet/minecraft/class_2561; @@ -39,3 +44,5 @@ CLASS net/minecraft/class_1918 net/minecraft/world/CommandBlockExecutor METHOD method_8303 getSource ()Lnet/minecraft/class_2168; METHOD method_8304 getSuccessCount ()I METHOD method_8305 readNbt (Lnet/minecraft/class_2487;Lnet/minecraft/class_7225$class_7874;)V + ARG 1 nbt + ARG 2 registries diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 617ab4822b..5ab4f4f3bf 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -504,6 +504,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 7 velocityX ARG 9 velocityY ARG 11 velocityZ + ARG 13 explosions METHOD method_8558 isValidHorizontally (Lnet/minecraft/class_2338;)Z ARG 0 pos CLASS class_7867 ExplosionSourceType diff --git a/mappings/net/minecraft/world/chunk/ChunkGenerating.mapping b/mappings/net/minecraft/world/chunk/ChunkGenerating.mapping new file mode 100644 index 0000000000..4540bad330 --- /dev/null +++ b/mappings/net/minecraft/world/chunk/ChunkGenerating.mapping @@ -0,0 +1,120 @@ +CLASS net/minecraft/class_9310 net/minecraft/world/chunk/ChunkGenerating + METHOD method_57594 initializeLight (Lnet/minecraft/class_3227;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 lightingProvider + ARG 1 chunk + METHOD method_57595 isLightOn (Lnet/minecraft/class_2791;)Z + ARG 0 chunk + METHOD method_57596 noop (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Lnet/minecraft/class_9311;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 status + ARG 2 fullChunkConverter + ARG 3 chunk + METHOD method_57597 noop (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_9311;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 status + ARG 2 executor + ARG 3 fullChunkConverter + ARG 4 chunks + ARG 5 chunk + METHOD method_57598 light (Lnet/minecraft/class_3227;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 lightingProvider + ARG 1 chunk + METHOD method_57599 (Lnet/minecraft/class_2791;)Lnet/minecraft/class_2791; + ARG 0 populated + METHOD method_57600 loadStructures (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Lnet/minecraft/class_9311;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 status + ARG 2 fullChunkConverter + ARG 3 chunk + METHOD method_57601 generateStructures (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_9311;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 status + ARG 2 executor + ARG 3 fullChunkConverter + ARG 4 chunks + ARG 5 chunk + METHOD method_57602 initializeLight (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Lnet/minecraft/class_9311;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 status + ARG 2 fullChunkConverter + ARG 3 chunk + METHOD method_57603 generateStructureReferences (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_9311;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 status + ARG 2 executor + ARG 3 fullChunkConverter + ARG 4 chunks + ARG 5 chunk + METHOD method_57604 light (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Lnet/minecraft/class_9311;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 status + ARG 2 fullChunkConverter + ARG 3 chunk + METHOD method_57605 populateBiomes (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_9311;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 status + ARG 2 executor + ARG 3 fullChunkConverter + ARG 4 chunks + ARG 5 chunk + METHOD method_57606 convertToFull (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Lnet/minecraft/class_9311;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 status + ARG 2 fullChunkConverter + ARG 3 chunk + METHOD method_57607 populateNoise (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_9311;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 status + ARG 2 executor + ARG 3 fullChunkConverter + ARG 4 chunks + ARG 5 chunk + METHOD method_57608 buildSurface (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_9311;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 status + ARG 2 executor + ARG 3 fullChunkConverter + ARG 4 chunks + ARG 5 chunk + METHOD method_57609 carve (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_9311;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 status + ARG 2 executor + ARG 3 fullChunkConverter + ARG 4 chunks + ARG 5 chunk + METHOD method_57610 generateFeatures (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_9311;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 status + ARG 2 executor + ARG 3 fullChunkConverter + ARG 4 chunks + ARG 5 chunk + METHOD method_57611 initializeLight (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_9311;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 status + ARG 2 executor + ARG 3 fullChunkConverter + ARG 4 chunks + ARG 5 chunk + METHOD method_57612 light (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_9311;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 status + ARG 2 executor + ARG 3 fullChunkConverter + ARG 4 chunks + ARG 5 chunk + METHOD method_57613 generateEntities (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_9311;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 status + ARG 2 executor + ARG 3 fullChunkConverter + ARG 4 chunks + ARG 5 chunk + METHOD method_57614 convertToFull (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_9311;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 0 context + ARG 1 status + ARG 2 executor + ARG 3 fullChunkConverter + ARG 4 chunks + ARG 5 chunk diff --git a/mappings/net/minecraft/world/chunk/ChunkGenerationContext.mapping b/mappings/net/minecraft/world/chunk/ChunkGenerationContext.mapping new file mode 100644 index 0000000000..7d361c3bfa --- /dev/null +++ b/mappings/net/minecraft/world/chunk/ChunkGenerationContext.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_9312 net/minecraft/world/chunk/ChunkGenerationContext + FIELD comp_2434 world Lnet/minecraft/class_3218; + FIELD comp_2437 lightingProvider Lnet/minecraft/class_3227; + METHOD comp_2434 world ()Lnet/minecraft/class_3218; + METHOD comp_2437 lightingProvider ()Lnet/minecraft/class_3227; diff --git a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping index 0198459185..dcbc5dc081 100644 --- a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping @@ -21,6 +21,10 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 7 loadTask METHOD method_12152 getTaskMargin ()I METHOD method_12154 runGenerationTask (Lnet/minecraft/class_9312;Ljava/util/concurrent/Executor;Lnet/minecraft/class_9311;Ljava/util/List;)Ljava/util/concurrent/CompletableFuture; + ARG 1 context + ARG 2 executor + ARG 3 fullChunkConverter + ARG 4 chunks METHOD method_12155 getMaxDistanceFromFull ()I METHOD method_12160 getHeightmapTypes ()Ljava/util/EnumSet; METHOD method_12161 byDistanceFromFull (I)Lnet/minecraft/class_2806; @@ -47,8 +51,25 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 6 generationTask ARG 7 loadTask METHOD method_20612 runLoadTask (Lnet/minecraft/class_9312;Lnet/minecraft/class_9311;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 1 context + ARG 2 fullChunkConverter + ARG 3 chunk METHOD method_51378 shouldAlwaysUpgrade ()Z + METHOD method_57593 (Lnet/minecraft/class_6613;Lnet/minecraft/class_2791;)Lnet/minecraft/class_2791; + ARG 2 chunk CLASS class_2807 GenerationTask COMMENT A task called when a chunk needs to be generated. + METHOD doWork (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_9311;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 1 context + ARG 2 status + ARG 3 executor + ARG 4 fullChunkConverter + ARG 5 chunks + ARG 6 chunk CLASS class_4305 LoadTask COMMENT A task called when a chunk is loaded but does not need to be generated. + METHOD doWork (Lnet/minecraft/class_9312;Lnet/minecraft/class_2806;Lnet/minecraft/class_9311;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 1 context + ARG 2 status + ARG 3 fullChunkConverter + ARG 4 chunk diff --git a/mappings/net/minecraft/world/chunk/FullChunkConverter.mapping b/mappings/net/minecraft/world/chunk/FullChunkConverter.mapping new file mode 100644 index 0000000000..2977de654b --- /dev/null +++ b/mappings/net/minecraft/world/chunk/FullChunkConverter.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_9311 net/minecraft/world/chunk/FullChunkConverter + METHOD apply (Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; + ARG 1 chunk diff --git a/mappings/net/minecraft/world/gen/StructureAccessor.mapping b/mappings/net/minecraft/world/gen/StructureAccessor.mapping index d66efdde0c..159d2411fe 100644 --- a/mappings/net/minecraft/world/gen/StructureAccessor.mapping +++ b/mappings/net/minecraft/world/gen/StructureAccessor.mapping @@ -56,6 +56,7 @@ CLASS net/minecraft/class_5138 net/minecraft/world/gen/StructureAccessor ARG 2 structureStart METHOD method_41034 getStructureContaining (Lnet/minecraft/class_2338;Lnet/minecraft/class_6885;)Lnet/minecraft/class_3449; ARG 1 pos + ARG 2 structures METHOD method_41035 getStructureStarts (Lnet/minecraft/class_1923;Ljava/util/function/Predicate;)Ljava/util/List; ARG 1 pos ARG 2 predicate @@ -64,5 +65,11 @@ CLASS net/minecraft/class_5138 net/minecraft/world/gen/StructureAccessor ARG 1 pos METHOD method_41413 getStructureContaining (Lnet/minecraft/class_2338;Ljava/util/function/Predicate;)Lnet/minecraft/class_3449; ARG 1 pos + ARG 2 predicate METHOD method_41414 (Lnet/minecraft/class_2378;Ljava/util/function/Predicate;Lnet/minecraft/class_3195;)Z ARG 2 structure + METHOD method_57559 (Lnet/minecraft/class_6862;Lnet/minecraft/class_6880;)Z + ARG 1 structure + METHOD method_57560 getStructureContaining (Lnet/minecraft/class_2338;Lnet/minecraft/class_6862;)Lnet/minecraft/class_3449; + ARG 1 pos + ARG 2 tag diff --git a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping index 64c7390e04..46dd53fae1 100644 --- a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage FIELD field_44951 DEFAULT_ALLOWED_SYMLINK_MATCHER Ljava/nio/file/PathMatcher; FIELD field_44952 symlinkFinder Lnet/minecraft/class_8580; FIELD field_46830 MAX_LEVEL_DATA_SIZE I + FIELD field_49426 RECOMMENDED_USABLE_SPACE_BYTES I METHOD (Ljava/nio/file/Path;Ljava/nio/file/Path;Lnet/minecraft/class_8580;Lcom/mojang/datafixers/DataFixer;)V ARG 1 savesDirectory ARG 2 backupsDirectory @@ -132,6 +133,8 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage METHOD method_54546 readOldLevelProperties ()Lcom/mojang/serialization/Dynamic; METHOD method_54547 levelDatExists ()Z METHOD method_54548 tryRestoreBackup ()Z + METHOD method_57628 getUsableSpace ()J + METHOD method_57629 shouldShowLowDiskSpaceWarning ()Z CLASS 1 METHOD postVisitDirectory (Ljava/lang/Object;Ljava/io/IOException;)Ljava/nio/file/FileVisitResult; ARG 1 path