From 69be007d9d2d1a3c08144ad8d013b566b7a7a4cc Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Mon, 24 Oct 2022 23:23:16 +0900 Subject: [PATCH] 22w42a everything else (#3355) --- mappings/net/minecraft/Bootstrap.mapping | 2 + .../net/minecraft/block/AbstractBlock.mapping | 4 +- mappings/net/minecraft/block/Block.mapping | 3 - .../minecraft/entity/EquipmentSlot.mapping | 53 +++++++-------- .../ai/brain/task/BiasedLongJumpTask.mapping | 1 + .../GiveInventoryToLookTargetTask.mapping | 1 + mappings/net/minecraft/item/Item.mapping | 5 +- mappings/net/minecraft/item/ItemGroup.mapping | 4 -- mappings/net/minecraft/nbt/NbtHelper.mapping | 4 +- mappings/net/minecraft/nbt/NbtOps.mapping | 66 ++++++++++++++++++- .../minecraft/server/DataPackContents.mapping | 2 + .../minecraft/server/MinecraftServer.mapping | 11 +++- .../server/world/ServerWorld.mapping | 4 ++ .../structure/StructureTemplate.mapping | 5 ++ .../StructureTemplateManager.mapping | 2 + .../net/minecraft/tag/TagGroupLoader.mapping | 1 + .../net/minecraft/test/TestContext.mapping | 18 ++++- .../minecraft/util/registry/Registry.mapping | 2 +- .../util/registry/RegistryEntry.mapping | 10 +-- 19 files changed, 145 insertions(+), 53 deletions(-) diff --git a/mappings/net/minecraft/Bootstrap.mapping b/mappings/net/minecraft/Bootstrap.mapping index 1e038d0f3c..9c8030e0b0 100644 --- a/mappings/net/minecraft/Bootstrap.mapping +++ b/mappings/net/minecraft/Bootstrap.mapping @@ -26,4 +26,6 @@ CLASS net/minecraft/class_2966 net/minecraft/Bootstrap ARG 0 callerGetter METHOD method_39889 (Lnet/minecraft/class_1959;)V ARG 0 biome + METHOD method_39890 (Lnet/minecraft/class_6880;)V + ARG 0 feature METHOD method_39891 logMissingBiomePlacementModifier ()V diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index 1a1bda3d0e..d1e6873799 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -710,7 +710,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock METHOD method_9588 scheduledTick (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V COMMENT Called server-side when a block receives a scheduled tick. This can be used like a timer. COMMENT Scheduled ticks are added using {@link - COMMENT WorldAccess#createAndScheduleBlockTick(BlockPos, Block, int)}. Additionally, {@link + COMMENT WorldAccess#scheduleBlockTick(BlockPos, Block, int)}. Additionally, {@link COMMENT #randomTick} by default calls this method; override {@link #randomTick} to disable this COMMENT behavior. COMMENT @@ -728,7 +728,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT COMMENT @deprecated Consider calling {@link AbstractBlockState#scheduledTick} instead. See why these methods are deprecated. COMMENT - COMMENT @see WorldAccess#createAndScheduleBlockTick(BlockPos, Block, int) + COMMENT @see WorldAccess#scheduleBlockTick(BlockPos, Block, int) COMMENT @see #getStateForNeighborUpdate COMMENT @see #randomTick ARG 1 state diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index a886a22a54..853c398c5e 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -318,9 +318,6 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 1 pos ARG 2 stack METHOD method_9578 appendStacks (Lnet/minecraft/class_1761;Lnet/minecraft/class_2371;)V - COMMENT Appends the stacks of this block shown in the item group to the list. - COMMENT - COMMENT @see net.minecraft.item.BlockItem#appendStacks(ItemGroup, DefaultedList) ARG 1 group ARG 2 stacks METHOD method_9579 isTranslucent (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z diff --git a/mappings/net/minecraft/entity/EquipmentSlot.mapping b/mappings/net/minecraft/entity/EquipmentSlot.mapping index 1370ce811f..c1bd111ef7 100644 --- a/mappings/net/minecraft/entity/EquipmentSlot.mapping +++ b/mappings/net/minecraft/entity/EquipmentSlot.mapping @@ -1,17 +1,17 @@ CLASS net/minecraft/class_1304 net/minecraft/entity/EquipmentSlot COMMENT Provides enum types for several key slots found within an entity {@link net.minecraft.inventory.Inventory}. COMMENT
- COMMENT Each {@link EquipmentSlot} has a type, which represents what inventory category it is contained within. - COMMENT The {@code HAND} category covers the mainhand & offhand slots, while the {@code ARMOR} category covers the 4 + COMMENT Each equipment slot has a type, which represents what inventory category it is contained within. + COMMENT The {@code HAND} category covers the mainhand and offhand slots, while the {@code ARMOR} category covers the 4 COMMENT types of armor slots found in {@link net.minecraft.entity.LivingEntity}. COMMENT
- COMMENT Each {@link EquipmentSlot} contains information on where that slot should be located within a parent {@link net.minecraft.inventory.Inventory}. - COMMENT {@link EquipmentSlot#getEntitySlotId()} will provide the base slot index an {@code EquipmentSlot} should occupy (starting from {@code 0}), - COMMENT while {@link EquipmentSlot#getOffsetEntitySlotId(int)} will return the same value added to an offset index. + COMMENT Each equipment slot contains information on where that slot should be located within a parent {@link net.minecraft.inventory.Inventory}. + COMMENT {@link #getEntitySlotId()} will provide the base slot index a slot should occupy (starting from {@code 0}), + COMMENT while {@link #getOffsetEntitySlotId(int)} will return the same value added to an offset index. COMMENT
- COMMENT {@link EquipmentSlot} can be used to quickly access the item held by an inventory slot in a {@link net.minecraft.entity.LivingEntity} through - COMMENT methods such as {@link net.minecraft.entity.LivingEntity#getEquippedStack(EquipmentSlot)}, which will return the {@link net.minecraft.item.ItemStack} - COMMENT held in the {@code LivingEntity}'s inventory slot pointed at by the target {@code EquipmentSlot}. + COMMENT An equipment slot can be used to quickly access the item held by an inventory slot in a {@link LivingEntity} through + COMMENT methods such as {@link LivingEntity#getEquippedStack(EquipmentSlot)}, which will return the {@link net.minecraft.item.ItemStack} + COMMENT held in the entity's inventory slot pointed at by the target slot. FIELD field_6167 armorStandId I FIELD field_6168 entityId I FIELD field_6170 type Lnet/minecraft/class_1304$class_1305; @@ -22,49 +22,42 @@ CLASS net/minecraft/class_1304 net/minecraft/entity/EquipmentSlot ARG 5 armorStandId ARG 6 name METHOD method_20234 fromTypeIndex (Lnet/minecraft/class_1304$class_1305;I)Lnet/minecraft/class_1304; - COMMENT Returns the {@link EquipmentSlot} where {@link EquipmentSlot#getEntitySlotId()} is equal to {@code index} and the type of the slot is equal to {@code type}. - COMMENT If no {@code EquipmentSlot} could be found matching the input {@code type} and {@code index}, throws {@link IllegalArgumentException}. + COMMENT {@return the equipment slot where {@linkplain #getEntitySlotId() the slot ID} is equal to {@code index} and the type of the slot is equal to {@code type}} + COMMENT If no slot could be found matching the input {@code type} and {@code index}, throws {@link IllegalArgumentException}. COMMENT COMMENT @throws IllegalArgumentException if no slot type could be found matching {@code type} and {@code index} - COMMENT @return an {@link EquipmentSlot} matching the given {@code type} and inventory {@code index} ARG 0 type ARG 1 index METHOD method_32320 getOffsetEntitySlotId (I)I - COMMENT @return the index of the inventory slot this {@link EquipmentSlot} should occupy, plus the passed in {@code offset} amount. + COMMENT {@return the index of the inventory slot this slot should occupy, plus the passed in {@code offset} amount} ARG 1 offset METHOD method_5923 getName ()Ljava/lang/String; - COMMENT Returns the unique name of this {@link EquipmentSlot}. - COMMENT The returned value will be a lower-case string (such as "chest" for {@link EquipmentSlot#CHEST}). + COMMENT {@return the unique name of this equipment slot} COMMENT - COMMENT @return the lower-case name of this {@link EquipmentSlot} + COMMENT
The returned value will be a lower-case string (such as "chest" for {@link #CHEST}). METHOD method_5924 byName (Ljava/lang/String;)Lnet/minecraft/class_1304; - COMMENT Returns the {@link EquipmentSlot} where {@link EquipmentSlot#getName()} is equal to {@code name}. - COMMENT If no {@code EquipmentSlot} could be found matching the input name, throws {@link IllegalArgumentException}. + COMMENT {@return the slot where {@linkplain #getName the name} is equal to {@code name}} + COMMENT If no slot matching the input name is found, this throws {@link IllegalArgumentException}. COMMENT COMMENT @throws IllegalArgumentException if no slot type could be found matching {@code name} - COMMENT @return an {@link EquipmentSlot} where {@link EquipmentSlot#getName()} equals {@code name} ARG 0 name METHOD method_5925 getType ()Lnet/minecraft/class_1304$class_1305; - COMMENT Returns the target {@link EquipmentSlot.Type} that this {@link EquipmentSlot} targets. + COMMENT {@return the target {@link EquipmentSlot.Type} that this slot targets} COMMENT COMMENT
- COMMENT An {@link EquipmentSlot} either targets the hand or body type, which can be used to determine whether a request - COMMENT to manipulate {@link EquipmentSlot} data on an entity should be applied to an armor inventory or general item inventory. - COMMENT - COMMENT @return the target {@link EquipmentSlot.Type} (hand or armor) of this {@link EquipmentSlot} + COMMENT An equipment slot either targets the hand or body type, which can be used to determine whether a request + COMMENT to manipulate slot data on an entity should be applied to an armor inventory or general item inventory. METHOD method_5926 getArmorStandSlotId ()I - COMMENT @return the index of the inventory slot this {@link EquipmentSlot} occupies in an {@link net.minecraft.entity.decoration.ArmorStandEntity} + COMMENT {@return the index of the inventory slot this slot occupies in an {@link net.minecraft.entity.decoration.ArmorStandEntity}} METHOD method_5927 getEntitySlotId ()I - COMMENT Returns the index of the inventory slot this {@link EquipmentSlot} should occupy. + COMMENT {@return the index of the inventory slot this slot should occupy} COMMENT COMMENT
- COMMENT In the case of {@link EquipmentSlot#MAINHAND} and {@link EquipmentSlot#OFFHAND}, this method will return 0 & 1, respectively. + COMMENT In the case of {@link #MAINHAND} and {@link #OFFHAND}, this method will return 0 and 1, respectively. COMMENT The remaining armor slots re-start at index 0 and end at index 3. COMMENT COMMENT
- COMMENT To calculate the target index of an inventory slot for an {@link EquipmentSlot} relative to the offset index of an entire
- COMMENT inventory, visit {@link EquipmentSlot#getOffsetEntitySlotId(int)}.
- COMMENT
- COMMENT @return index of the inventory slot this {@link EquipmentSlot} should occupy
+ COMMENT To calculate the target index of an inventory slot for a slot relative to the offset index of an entire
+ COMMENT inventory, visit {@link #getOffsetEntitySlotId(int)}.
CLASS class_1305 Type
COMMENT The type of body item slot an {@link EquipmentSlot} targets.
diff --git a/mappings/net/minecraft/entity/ai/brain/task/BiasedLongJumpTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/BiasedLongJumpTask.mapping
index 29cf0be42c..1c50968184 100644
--- a/mappings/net/minecraft/entity/ai/brain/task/BiasedLongJumpTask.mapping
+++ b/mappings/net/minecraft/entity/ai/brain/task/BiasedLongJumpTask.mapping
@@ -11,3 +11,4 @@ CLASS net/minecraft/class_7096 net/minecraft/entity/ai/brain/task/BiasedLongJump
ARG 5 entityToSound
ARG 6 favoredBlocks
ARG 7 biasChance
+ ARG 8 jumpToPredicate
diff --git a/mappings/net/minecraft/entity/ai/brain/task/GiveInventoryToLookTargetTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/GiveInventoryToLookTargetTask.mapping
index 7265469f3e..96d6f3d402 100644
--- a/mappings/net/minecraft/entity/ai/brain/task/GiveInventoryToLookTargetTask.mapping
+++ b/mappings/net/minecraft/entity/ai/brain/task/GiveInventoryToLookTargetTask.mapping
@@ -4,6 +4,7 @@ CLASS net/minecraft/class_7296 net/minecraft/entity/ai/brain/task/GiveInventoryT
METHOD Items with no custom behavior, like diamonds, can call the constructor of Item
COMMENT directly. If a custom behavior is needed, this should be subclassed. Items also have
@@ -403,7 +402,7 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item
COMMENT whether the item is in the selected hotbar slot
CLASS class_1793 Settings
COMMENT Item settings configure behaviors common to all items, such as the stack's max
- COMMENT count and the item group. An instance of this must be passed to the constructor
+ COMMENT count. An instance of this must be passed to the constructor
COMMENT of {@link Item} (or most of its subclasses).
FIELD field_18673 foodComponent Lnet/minecraft/class_4174;
FIELD field_21980 fireproof Z
diff --git a/mappings/net/minecraft/item/ItemGroup.mapping b/mappings/net/minecraft/item/ItemGroup.mapping
index 0e8d9c60ec..93636cc01d 100644
--- a/mappings/net/minecraft/item/ItemGroup.mapping
+++ b/mappings/net/minecraft/item/ItemGroup.mapping
@@ -1,9 +1,5 @@
CLASS net/minecraft/class_1761 net/minecraft/item/ItemGroup
COMMENT A group of items that the items belong to. This is used by the creative inventory.
- COMMENT Use {@link Item.Settings#group(ItemGroup)} to assign an item group to an item.
- COMMENT
- COMMENT @see Item#appendStacks
- COMMENT @see Item#isIn(ItemGroup)
FIELD field_26391 displayName Lnet/minecraft/class_2561;
FIELD field_40184 displayStacks Lnet/minecraft/class_7708;
FIELD field_40185 searchTabStacks Lnet/minecraft/class_7708;
diff --git a/mappings/net/minecraft/nbt/NbtHelper.mapping b/mappings/net/minecraft/nbt/NbtHelper.mapping
index 2d55517c11..f36874a19c 100644
--- a/mappings/net/minecraft/nbt/NbtHelper.mapping
+++ b/mappings/net/minecraft/nbt/NbtHelper.mapping
@@ -17,6 +17,8 @@ CLASS net/minecraft/class_2512 net/minecraft/nbt/NbtHelper
COMMENT if the block name is not present.
COMMENT
COMMENT @see #fromBlockState(BlockState)
+ ARG 0 blockRegistryWrapper
+ ARG 1 nbt
METHOD method_10682 withProperty (Lnet/minecraft/class_2688;Lnet/minecraft/class_2769;Ljava/lang/String;Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2688;
ARG 0 state
ARG 1 property
@@ -41,7 +43,7 @@ CLASS net/minecraft/class_2512 net/minecraft/nbt/NbtHelper
METHOD method_10686 fromBlockState (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2487;
COMMENT {@return the serialized block state}
COMMENT
- COMMENT @see #toBlockState(NbtCompound)
+ COMMENT @see #toBlockState(CommandRegistryWrapper, NbtCompound)
ARG 0 state
METHOD method_10687 matches (Lnet/minecraft/class_2520;Lnet/minecraft/class_2520;Z)Z
COMMENT {@return whether {@code standard} is a subset of {@code subject}}
diff --git a/mappings/net/minecraft/nbt/NbtOps.mapping b/mappings/net/minecraft/nbt/NbtOps.mapping
index a2231c8618..dabfb63d01 100644
--- a/mappings/net/minecraft/nbt/NbtOps.mapping
+++ b/mappings/net/minecraft/nbt/NbtOps.mapping
@@ -18,7 +18,9 @@ CLASS net/minecraft/class_2509 net/minecraft/nbt/NbtOps
COMMENT with an ordered list of values in serialization). In fact, since
COMMENT Minecraft NBT lists can only contain elements of the same type, this op
COMMENT cannot compress maps.
+ FIELD field_40667 MARKER_KEY Ljava/lang/String;
METHOD convertTo (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Ljava/lang/Object;
+ ARG 1 ops
ARG 2 element
METHOD createBoolean (Z)Ljava/lang/Object;
ARG 1 value
@@ -97,10 +99,14 @@ CLASS net/minecraft/class_2509 net/minecraft/nbt/NbtOps
ARG 1 entry
METHOD method_29153 (Lnet/minecraft/class_2487;Ljava/util/function/BiConsumer;)V
ARG 2 entryConsumer
- METHOD method_29159 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;Ljava/lang/String;)V
- ARG 0 key
METHOD method_29161 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;Ljava/lang/String;)V
ARG 2 key
+ METHOD method_46230 (Ljava/util/List;Lnet/minecraft/class_2509$class_7813;)Lcom/mojang/serialization/DataResult;
+ ARG 1 merger
+ METHOD method_46234 (Lnet/minecraft/class_2520;Lnet/minecraft/class_2509$class_7813;)Lcom/mojang/serialization/DataResult;
+ ARG 1 merger
+ METHOD method_46235 createMerger (Lnet/minecraft/class_2520;)Ljava/util/Optional;
+ ARG 0 nbt
METHOD remove (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
ARG 1 element
ARG 2 key
@@ -119,3 +125,59 @@ CLASS net/minecraft/class_2509 net/minecraft/nbt/NbtOps
METHOD build (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
ARG 1 nbt
ARG 2 mergedValue
+ CLASS class_7808 ByteArrayMerger
+ FIELD field_40668 list Lit/unimi/dsi/fastutil/bytes/ByteArrayList;
+ METHOD There are several other methods used for reading the contents of the registry:
COMMENT Therefore, it is very important to construct any intrusive-entry type object
COMMENT and register at the same time. For example, a mod that conditionally registers an
- COMMENT {@link Item} has to create an instance only if the condition is met. (See {@link Registry}
- COMMENT for a code example.)
+ COMMENT {@link net.minecraft.item.Item} has to create an instance only if the condition is met.
+ COMMENT (See {@link Registry} for a code example.)
COMMENT
COMMENT When a reference registry entry is first instantiated, it only has either the key
COMMENT or the value (depending on the type). They are later filled when registering the
- COMMENT
COMMENT
COMMENT