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 (Ljava/util/function/Function;FI)V ARG 1 lookTargetFunction ARG 2 speed + ARG 3 runTime METHOD method_42649 hasItemAndTarget (Lnet/minecraft/class_1309;)Z ARG 1 entity METHOD method_42650 (Lnet/minecraft/class_1309;Lnet/minecraft/class_4115;)V diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping index e5a4c1dbd5..08c1621a01 100644 --- a/mappings/net/minecraft/item/Item.mapping +++ b/mappings/net/minecraft/item/Item.mapping @@ -6,8 +6,7 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item COMMENT is held by an {@link ItemStack} which represents a stack of specific item. Therefore, COMMENT there is one - and only one - instance of Item for one item (like apples, oak planks, etc), COMMENT while there can be infinite amounts of {@link ItemStack} instances. This also means that - COMMENT items themselves cannot hold NBT data. To append item stacks with NBT data to the - COMMENT creative inventory, override {@link #appendStacks}. + COMMENT items themselves cannot hold NBT data. COMMENT COMMENT

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 (B)V + ARG 1 value + METHOD ([B)V + ARG 1 values + CLASS class_7809 CompoundListMerger + FIELD field_40669 list Lnet/minecraft/class_2499; + METHOD (Lit/unimi/dsi/fastutil/bytes/ByteArrayList;)V + ARG 1 list + METHOD (Lit/unimi/dsi/fastutil/ints/IntArrayList;)V + ARG 1 list + METHOD (Lit/unimi/dsi/fastutil/longs/LongArrayList;)V + ARG 1 list + METHOD (Ljava/util/Collection;)V + ARG 1 nbts + METHOD method_46241 (B)V + ARG 1 value + METHOD method_46242 (I)V + ARG 1 value + METHOD method_46243 (J)V + ARG 1 value + METHOD method_46244 isMarker (Lnet/minecraft/class_2487;)Z + ARG 0 nbt + METHOD method_46245 makeMarker (Lnet/minecraft/class_2520;)Lnet/minecraft/class_2520; + ARG 0 value + METHOD method_46246 createMarkerNbt (Lnet/minecraft/class_2520;)Lnet/minecraft/class_2487; + ARG 0 value + CLASS class_7810 ListMerger + FIELD field_40670 list Lnet/minecraft/class_2499; + METHOD (Lnet/minecraft/class_2499;)V + ARG 1 nbt + METHOD (Lnet/minecraft/class_2520;)V + ARG 1 nbt + CLASS class_7811 BasicMerger + FIELD field_40671 EMPTY Lnet/minecraft/class_2509$class_7811; + CLASS class_7812 IntArrayMerger + FIELD field_40672 list Lit/unimi/dsi/fastutil/ints/IntArrayList; + METHOD (I)V + ARG 1 value + METHOD ([I)V + ARG 1 values + CLASS class_7813 Merger + METHOD method_46239 getResult ()Lnet/minecraft/class_2520; + METHOD method_46240 merge (Lnet/minecraft/class_2520;)Lnet/minecraft/class_2509$class_7813; + ARG 1 nbt + METHOD method_46247 merge (Ljava/lang/Iterable;)Lnet/minecraft/class_2509$class_7813; + ARG 1 nbts + METHOD method_46248 merge (Ljava/util/stream/Stream;)Lnet/minecraft/class_2509$class_7813; + ARG 1 nbts + CLASS class_7814 LongArrayMerger + FIELD field_40673 list Lit/unimi/dsi/fastutil/longs/LongArrayList; + METHOD (J)V + ARG 1 value + METHOD ([J)V + ARG 1 values diff --git a/mappings/net/minecraft/server/DataPackContents.mapping b/mappings/net/minecraft/server/DataPackContents.mapping index f2ad0134ca..ee42db3d15 100644 --- a/mappings/net/minecraft/server/DataPackContents.mapping +++ b/mappings/net/minecraft/server/DataPackContents.mapping @@ -17,6 +17,7 @@ CLASS net/minecraft/class_5350 net/minecraft/server/DataPackContents FIELD field_38051 commandRegistryAccess Lnet/minecraft/class_7157; METHOD (Lnet/minecraft/class_5455$class_6890;Lnet/minecraft/class_7699;Lnet/minecraft/class_2170$class_5364;I)V ARG 1 dynamicRegistryManager + ARG 2 enabledFeatures ARG 3 environment ARG 4 functionPermissionLevel METHOD method_29465 getFunctionLoader ()Lnet/minecraft/class_5349; @@ -30,6 +31,7 @@ CLASS net/minecraft/class_5350 net/minecraft/server/DataPackContents COMMENT @see MinecraftServer#reloadResources ARG 0 manager ARG 1 dynamicRegistryManager + ARG 2 enabledFeatures ARG 3 environment ARG 4 functionPermissionLevel ARG 5 prepareExecutor diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index c064ba3670..985c5691cd 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -30,7 +30,7 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_24370 structureTemplateManager Lnet/minecraft/class_3485; FIELD field_24371 saveHandler Lnet/minecraft/class_29; FIELD field_24372 saveProperties Lnet/minecraft/class_5219; - FIELD field_25132 registryManager Lnet/minecraft/class_7780; + FIELD field_25132 combinedDynamicRegistries Lnet/minecraft/class_7780; FIELD field_25318 resourceManagerHolder Lnet/minecraft/server/MinecraftServer$class_6897; FIELD field_33205 MILLISECONDS_PER_TICK J FIELD field_33210 START_TICKET_CHUNK_RADIUS I @@ -157,6 +157,7 @@ CLASS net/minecraft/server/MinecraftServer ARG 0 resourcePackManager ARG 1 dataPackSettings ARG 2 safeMode + ARG 3 enabledFeatures METHOD method_29738 (Ljava/util/Collection;Ljava/lang/String;)Z ARG 1 name METHOD method_29740 startServer (Ljava/util/function/Function;)Lnet/minecraft/server/MinecraftServer; @@ -246,6 +247,13 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_3745 setFlightEnabled (Z)V ARG 1 flightEnabled METHOD method_3747 stop (Z)V + COMMENT Stops this server. + COMMENT + COMMENT @apiNote Pass {@code true} to {@code waitForShutdown} to wait until the server shuts + COMMENT down. Note that this must be {@code false} if called from the server thread, + COMMENT otherwise it deadlocks. + ARG 1 waitForShutdown + COMMENT whether to wait for server shutdown, if called outside the server thread METHOD method_37475 (Lnet/minecraft/class_2926;Ljava/io/File;)V ARG 1 file METHOD method_3748 tick (Ljava/util/function/BooleanSupplier;)V @@ -419,6 +427,7 @@ CLASS net/minecraft/server/MinecraftServer COMMENT COMMENT @see MessageDecorator METHOD method_44301 getServicesSignatureVerifier ()Lnet/minecraft/class_7500; + METHOD method_46221 getCombinedDynamicRegistries ()Lnet/minecraft/class_7780; METHOD method_5387 isMainThread ()Z CLASS class_6414 DebugStart FIELD field_33980 time J diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index ec80e20bd0..2a0c30307a 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -227,6 +227,10 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld METHOD method_19503 hasRaidAt (Lnet/minecraft/class_2338;)Z COMMENT {@return {@code true} if a raid exists within 96 block radius of {@code pos}} ARG 1 pos + METHOD method_19535 (Lnet/minecraft/class_2338;Lnet/minecraft/class_6880;)V + ARG 2 newPoiType + METHOD method_19536 (Lnet/minecraft/class_2338;Lnet/minecraft/class_6880;)V + ARG 2 oldPoiType METHOD method_20588 isNearOccupiedPointOfInterest (Lnet/minecraft/class_4076;)Z ARG 1 sectionPos METHOD method_21624 dumpEntities (Ljava/io/Writer;Ljava/lang/Iterable;)V diff --git a/mappings/net/minecraft/structure/StructureTemplate.mapping b/mappings/net/minecraft/structure/StructureTemplate.mapping index b65442f2c7..7a4c47cfe9 100644 --- a/mappings/net/minecraft/structure/StructureTemplate.mapping +++ b/mappings/net/minecraft/structure/StructureTemplate.mapping @@ -76,6 +76,9 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/StructureTemplate ARG 2 rotation ARG 3 pivot METHOD method_15177 loadPalettedBlockInfo (Lnet/minecraft/class_7225;Lnet/minecraft/class_2499;Lnet/minecraft/class_2499;)V + ARG 1 blockRegistryWrapper + ARG 2 palette + ARG 3 blocks METHOD method_15179 spawnEntities (Lnet/minecraft/class_5425;Lnet/minecraft/class_2338;Lnet/minecraft/class_2415;Lnet/minecraft/class_2470;Lnet/minecraft/class_2338;Lnet/minecraft/class_3341;Z)V ARG 1 world ARG 2 pos @@ -91,6 +94,8 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/StructureTemplate ARG 4 pos2 METHOD method_15181 getAuthor ()Ljava/lang/String; METHOD method_15183 readNbt (Lnet/minecraft/class_7225;Lnet/minecraft/class_2487;)V + ARG 1 blockRegistryWrapper + ARG 2 nbt METHOD method_15184 createNbtDoubleList ([D)Lnet/minecraft/class_2499; ARG 1 doubles METHOD method_16185 (Lnet/minecraft/class_3499$class_3501;)I diff --git a/mappings/net/minecraft/structure/StructureTemplateManager.mapping b/mappings/net/minecraft/structure/StructureTemplateManager.mapping index 30853a35d0..57a64365a3 100644 --- a/mappings/net/minecraft/structure/StructureTemplateManager.mapping +++ b/mappings/net/minecraft/structure/StructureTemplateManager.mapping @@ -9,11 +9,13 @@ CLASS net/minecraft/class_3485 net/minecraft/structure/StructureTemplateManager FIELD field_31686 SNBT_FILE_EXTENSION Ljava/lang/String; FIELD field_39416 GAME_TEST_STRUCTURES_DIRECTORY Ljava/lang/String; FIELD field_39417 providers Ljava/util/List; + FIELD field_40369 blockRegistryWrapper Lnet/minecraft/class_7225; FIELD field_40370 NBT_FINDER Lnet/minecraft/class_7654; METHOD (Lnet/minecraft/class_3300;Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_7225;)V ARG 1 resourceManager ARG 2 session ARG 3 dataFixer + ARG 4 blockRegistryWrapper METHOD method_15085 getTemplatePath (Ljava/nio/file/Path;Lnet/minecraft/class_2960;Ljava/lang/String;)Ljava/nio/file/Path; ARG 0 path ARG 1 id diff --git a/mappings/net/minecraft/tag/TagGroupLoader.mapping b/mappings/net/minecraft/tag/TagGroupLoader.mapping index ccc72b44d8..e48cd07f22 100644 --- a/mappings/net/minecraft/tag/TagGroupLoader.mapping +++ b/mappings/net/minecraft/tag/TagGroupLoader.mapping @@ -39,6 +39,7 @@ CLASS net/minecraft/class_3503 net/minecraft/tag/TagGroupLoader METHOD method_32847 (Lcom/google/common/collect/Multimap;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Z ARG 2 id METHOD method_33174 loadTags (Lnet/minecraft/class_3300;)Ljava/util/Map; + ARG 1 resourceManager METHOD method_33175 (Lnet/minecraft/class_2960;Ljava/util/Collection;)V ARG 1 missingReferences METHOD method_33176 load (Lnet/minecraft/class_3300;)Ljava/util/Map; diff --git a/mappings/net/minecraft/test/TestContext.mapping b/mappings/net/minecraft/test/TestContext.mapping index 22a02ede4b..b0faca3bef 100644 --- a/mappings/net/minecraft/test/TestContext.mapping +++ b/mappings/net/minecraft/test/TestContext.mapping @@ -237,7 +237,7 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext ARG 1 runnable METHOD method_36019 (Ljava/lang/Runnable;J)V ARG 2 tick - METHOD method_36021 createMockPlayer ()Lnet/minecraft/class_1657; + METHOD method_36021 createMockCreativePlayer ()Lnet/minecraft/class_1657; METHOD method_36022 expectEntityAt (Lnet/minecraft/class_1299;III)V ARG 1 type ARG 2 x @@ -269,6 +269,7 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext ARG 2 pos METHOD method_36034 useBlock (Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;)V ARG 1 pos + ARG 2 player METHOD method_36035 runAtEveryTick (Ljava/lang/Runnable;)V ARG 1 task METHOD method_36036 complete ()V @@ -324,3 +325,18 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext ARG 2 pos ARG 3 amount ARG 4 radius + METHOD method_46224 expectEntityInside (Lnet/minecraft/class_1299;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)V + ARG 1 type + ARG 2 pos1 + ARG 3 pos2 + METHOD method_46225 spawnItem (Lnet/minecraft/class_1792;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1542; + ARG 1 item + ARG 2 pos + METHOD method_46226 assertTrue (ZLjava/lang/String;)V + ARG 1 condition + ARG 2 message + METHOD method_46227 getRelative (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; + ARG 1 pos + METHOD method_46228 createMockSurvivalPlayer ()Lnet/minecraft/class_1657; + METHOD method_46229 useBlock (Lnet/minecraft/class_2338;)V + ARG 1 pos diff --git a/mappings/net/minecraft/util/registry/Registry.mapping b/mappings/net/minecraft/util/registry/Registry.mapping index ba4d4a7efd..2e1d5274c8 100644 --- a/mappings/net/minecraft/util/registry/Registry.mapping +++ b/mappings/net/minecraft/util/registry/Registry.mapping @@ -73,7 +73,7 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry COMMENT COMMENT

There are several other methods used for reading the contents of the registry: COMMENT

COMMENT 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