diff --git a/mappings/net/minecraft/block/BedBlock.mapping b/mappings/net/minecraft/block/BedBlock.mapping index f1f0a4ba14..f41f9f7f30 100644 --- a/mappings/net/minecraft/block/BedBlock.mapping +++ b/mappings/net/minecraft/block/BedBlock.mapping @@ -35,7 +35,7 @@ CLASS net/minecraft/class_2244 net/minecraft/block/BedBlock COMMENT {@return whether the world's {@linkplain net.minecraft.world.dimension.DimensionType dimension type} COMMENT allows beds to be respawned at and slept in without exploding} COMMENT - COMMENT @see net.minecraft.world.dimension.DimensionType#isBedWorking() + COMMENT @see net.minecraft.world.dimension.DimensionType#bedWorks ARG 0 world METHOD method_30835 findWakeUpPosition (Lnet/minecraft/class_1299;Lnet/minecraft/class_1941;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_2350;)Ljava/util/Optional; ARG 0 type diff --git a/mappings/net/minecraft/client/option/SimpleOption.mapping b/mappings/net/minecraft/client/option/SimpleOption.mapping index 58075d93f0..924fdca310 100644 --- a/mappings/net/minecraft/client/option/SimpleOption.mapping +++ b/mappings/net/minecraft/client/option/SimpleOption.mapping @@ -231,7 +231,7 @@ CLASS net/minecraft/class_7172 net/minecraft/client/option/SimpleOption METHOD method_41758 validate (Ljava/lang/Object;)Ljava/util/Optional; COMMENT {@return the validated value} COMMENT - COMMENT
Returning {@link Optional.empty()} indicates the passed value is invalid and it + COMMENT
Returning {@link Optional#empty()} indicates the passed value is invalid and it COMMENT should reset to the default value. This method can also coerce the invalid value COMMENT into a valid one by clamping, etc. ARG 1 value diff --git a/mappings/net/minecraft/command/CommandRegistryAccess.mapping b/mappings/net/minecraft/command/CommandRegistryAccess.mapping index 1d7a5ddf66..914116ec6f 100644 --- a/mappings/net/minecraft/command/CommandRegistryAccess.mapping +++ b/mappings/net/minecraft/command/CommandRegistryAccess.mapping @@ -20,11 +20,11 @@ CLASS net/minecraft/class_7157 net/minecraft/command/CommandRegistryAccess ARG 1 registryRef COMMENT the registry key of the registry to wrap CLASS class_7158 EntryListCreationPolicy - COMMENT A policy on how to handle a {@link TagKey} that does not resolve to an existing - COMMENT tag (unrecognized tag) in {@link CommandRegistryWrapper#getEntryList}. + COMMENT A policy on how to handle a {@link net.minecraft.tag.TagKey} that does not resolve + COMMENT to an existing tag (unrecognized tag) in {@link CommandRegistryWrapper#getEntryList}. FIELD field_37824 Lnet/minecraft/class_7157$class_7158; - COMMENT Creates a new {@link RegistryEntryList}, stores it and returns it. + COMMENT Creates a new {@link net.minecraft.util.registry.RegistryEntryList}, stores it and returns it. FIELD field_37825 Lnet/minecraft/class_7157$class_7158; - COMMENT Returns a new, empty {@link RegistryEntryList} every time. + COMMENT Returns a new, empty {@link net.minecraft.util.registry.RegistryEntryList} every time. FIELD field_37826 Lnet/minecraft/class_7157$class_7158; - COMMENT Returns {@link Optional.empty()}. + COMMENT Returns {@link Optional#empty()}. diff --git a/mappings/net/minecraft/command/CommandRegistryWrapper.mapping b/mappings/net/minecraft/command/CommandRegistryWrapper.mapping index 444773b19e..31cce61f09 100644 --- a/mappings/net/minecraft/command/CommandRegistryWrapper.mapping +++ b/mappings/net/minecraft/command/CommandRegistryWrapper.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_7225 net/minecraft/command/CommandRegistryWrapper COMMENT
The methods in this class in most cases perform the same as ones defined COMMENT in {@link Registry}. However, subclasses may have slightly different behaviors COMMENT to make it easier to handle user-passed arguments. For example, {@link #getEntryList(TagKey)} - COMMENT may return an empty {@link RegistryEntryList} instead of {@link Optional.empty()}. + COMMENT may return an empty {@link RegistryEntryList} instead of {@link Optional#empty()}. COMMENT COMMENT
A wrapper without any special behaviors can be created by calling {#link of(Registry)}. METHOD method_41700 getEntryList (Lnet/minecraft/class_6862;)Ljava/util/Optional; @@ -12,7 +12,7 @@ CLASS net/minecraft/class_7225 net/minecraft/command/CommandRegistryWrapper COMMENT COMMENT
Implementations have different behaviors for unrecognized tags. The
COMMENT {@linkplain CommandRegistryWrapper.Impl#getEntryList default implementation}
- COMMENT returns {@link Optional.empty()}; however, the ones created by
+ COMMENT returns {@link Optional#empty()}; however, the ones created by
COMMENT {@link CommandRegistryAccess#createWrapper} can create and return a new entry list, or
COMMENT return an empty entry list.
COMMENT
diff --git a/mappings/net/minecraft/command/argument/RegistryKeyArgumentType.mapping b/mappings/net/minecraft/command/argument/RegistryKeyArgumentType.mapping
index d493e92cd2..36630d3d7d 100644
--- a/mappings/net/minecraft/command/argument/RegistryKeyArgumentType.mapping
+++ b/mappings/net/minecraft/command/argument/RegistryKeyArgumentType.mapping
@@ -1,8 +1,10 @@
CLASS net/minecraft/class_7079 net/minecraft/command/argument/RegistryKeyArgumentType
FIELD field_37269 EXAMPLES Ljava/util/Collection;
FIELD field_37270 UNKNOWN_ATTRIBUTE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
- FIELD field_37271 INVALID_CONFIGURED_FEATURE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
+ FIELD field_37271 INVALID_FEATURE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
FIELD field_37272 registryRef Lnet/minecraft/class_5321;
+ FIELD field_39191 INVALID_STRUCTURE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
+ FIELD field_39192 INVALID_JIGSAW_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
METHOD To control the details of experience dropping, consider overriding
COMMENT {@link #shouldAlwaysDropXp()}, {@link #shouldDropXp()}, and
- COMMENT {@link #getXpToDrop(PlayerEntity)}.
+ COMMENT {@link #getXpToDrop()}.
METHOD method_24518 isHolding (Lnet/minecraft/class_1792;)Z
COMMENT Checks if this entity is holding a certain item.
COMMENT
@@ -447,7 +447,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
COMMENT
COMMENT @see #dropXp()
COMMENT @see #shouldAlwaysDropXp()
- COMMENT @see #getXpToDrop(PlayerEntity)
+ COMMENT @see #getXpToDrop()
METHOD method_6055 getHandSwingProgress (F)F
ARG 1 tickDelta
METHOD method_6056 damageShield (F)V
@@ -476,7 +476,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
COMMENT other checks.
COMMENT
COMMENT @see #dropXp()
- COMMENT @see #getXpToDrop(PlayerEntity)
+ COMMENT @see #getXpToDrop()
METHOD method_6072 updateLeaningPitch ()V
METHOD method_6073 setAbsorptionAmount (F)V
ARG 1 amount
@@ -563,9 +563,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
COMMENT Called when this entity is killed and returns the amount of experience
COMMENT to drop.
COMMENT
- COMMENT {@code player} may be {@code null} if {@linkplain #shouldAlwaysDropXp
- COMMENT shouldAlwaysDropXp()} returns {@code true}.
- COMMENT
COMMENT @see #dropXp()
COMMENT @see #shouldAlwaysDropXp()
COMMENT @see #shouldDropXp()
diff --git a/mappings/net/minecraft/loot/condition/LootConditionConsumingBuilder.mapping b/mappings/net/minecraft/loot/condition/LootConditionConsumingBuilder.mapping
index 494a62fc9f..f876358e8a 100644
--- a/mappings/net/minecraft/loot/condition/LootConditionConsumingBuilder.mapping
+++ b/mappings/net/minecraft/loot/condition/LootConditionConsumingBuilder.mapping
@@ -1,4 +1,7 @@
CLASS net/minecraft/class_192 net/minecraft/loot/condition/LootConditionConsumingBuilder
- METHOD method_512 getThis ()Lnet/minecraft/class_192;
+ METHOD method_43744 conditionally (Ljava/lang/Iterable;Ljava/util/function/Function;)Lnet/minecraft/class_192;
+ ARG 1 conditions
+ ARG 2 toBuilderFunction
+ METHOD method_512 getThisConditionConsumingBuilder ()Lnet/minecraft/class_192;
METHOD method_840 conditionally (Lnet/minecraft/class_5341$class_210;)Lnet/minecraft/class_192;
ARG 1 condition
diff --git a/mappings/net/minecraft/loot/entry/AlternativeEntry.mapping b/mappings/net/minecraft/loot/entry/AlternativeEntry.mapping
index f186e0e84b..08a2a7b1ff 100644
--- a/mappings/net/minecraft/loot/entry/AlternativeEntry.mapping
+++ b/mappings/net/minecraft/loot/entry/AlternativeEntry.mapping
@@ -4,6 +4,9 @@ CLASS net/minecraft/class_65 net/minecraft/loot/entry/AlternativeEntry
METHOD method_387 ([Lnet/minecraft/class_64;Lnet/minecraft/class_47;Ljava/util/function/Consumer;)Z
ARG 1 context
ARG 2 lootChoiceExpander
+ METHOD method_43734 builder (Ljava/util/Collection;Ljava/util/function/Function;)Lnet/minecraft/class_65$class_66;
+ ARG 0 children
+ ARG 1 toBuilderFunction
CLASS class_66 Builder
FIELD field_979 children Ljava/util/List;
METHOD Starts by scanning each resource pack from highest priority to lowest. If no resource packs were found
- COMMENT to contain the requested entry, will throw a {@code FileNotFoundException}.
+ COMMENT to contain the requested entry, will return {@link Optional#empty()}.
COMMENT
COMMENT The returned resource must be closed to avoid resource leaks.
- COMMENT
- COMMENT @throws java.io.FileNotFoundException if the identified resource could not be found, or could not be loaded.
- COMMENT @throws IOException if the identified resource was found but a stream to it could not be opened.
ARG 1 id
COMMENT the resource identifier to search for
diff --git a/mappings/net/minecraft/resource/ResourceManager.mapping b/mappings/net/minecraft/resource/ResourceManager.mapping
index 4403ce5bdd..84f50934de 100644
--- a/mappings/net/minecraft/resource/ResourceManager.mapping
+++ b/mappings/net/minecraft/resource/ResourceManager.mapping
@@ -23,9 +23,6 @@ CLASS net/minecraft/class_3300 net/minecraft/resource/ResourceManager
COMMENT list is what would be returned normally by {@link #getResource}
COMMENT
COMMENT Each resource in this returned list must be closed to avoid resource leaks.
- COMMENT
- COMMENT @throws java.io.FileNotFoundException if no matching resources could be found (i.e. if the list would be empty)
- COMMENT @throws IOException if resources were found, but any one of them could not be opened to be read.
ARG 1 id
COMMENT the resource identifier to search for
METHOD method_29213 streamResourcePacks ()Ljava/util/stream/Stream;
diff --git a/mappings/net/minecraft/server/DataPackContents.mapping b/mappings/net/minecraft/server/DataPackContents.mapping
index c55c1c3667..30eead910c 100644
--- a/mappings/net/minecraft/server/DataPackContents.mapping
+++ b/mappings/net/minecraft/server/DataPackContents.mapping
@@ -1,7 +1,8 @@
CLASS net/minecraft/class_5350 net/minecraft/server/DataPackContents
COMMENT Contains loaders for contents controllable by data packs.
COMMENT
- COMMENT This can be accessed via {@link MinecraftServer.ResourceManagerHolder#dataPackContents}.
+ COMMENT This can be accessed via {@link
+ COMMENT net.minecraft.server.MinecraftServer.ResourceManagerHolder#dataPackContents}.
COMMENT There are shortcut methods to access individual loaders on {@link MinecraftServer}.
FIELD field_25334 COMPLETED_UNIT Ljava/util/concurrent/CompletableFuture;
FIELD field_25336 commandManager Lnet/minecraft/class_2170;
diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping
index b84ca83de6..b6023e9c2c 100644
--- a/mappings/net/minecraft/server/world/ServerWorld.mapping
+++ b/mappings/net/minecraft/server/world/ServerWorld.mapping
@@ -368,7 +368,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld
COMMENT
COMMENT @return the position of the structure, or {@code null} if no structure could be found within the given search radius
COMMENT
- COMMENT @see ChunkGenerator#locateStructure
+ COMMENT @see ChunkGenerator#locateStructure(ServerWorld, RegistryEntryList, BlockPos, int, boolean)
ARG 1 structureTag
ARG 2 pos
COMMENT the position to start the searching at
diff --git a/mappings/net/minecraft/structure/WoodlandMansionGenerator.mapping b/mappings/net/minecraft/structure/WoodlandMansionGenerator.mapping
index a33d688d48..d4a945049b 100644
--- a/mappings/net/minecraft/structure/WoodlandMansionGenerator.mapping
+++ b/mappings/net/minecraft/structure/WoodlandMansionGenerator.mapping
@@ -2,7 +2,7 @@ CLASS net/minecraft/class_3471 net/minecraft/structure/WoodlandMansionGenerator
COMMENT The generator for the woodland mansion structure.
COMMENT
COMMENT The cobblestones underneath the mansion are generated {@linkplain
- COMMENT net.minecraft.world.gen.feature.WoodlandMansionFeature#postPlace after
+ COMMENT net.minecraft.world.gen.structure.WoodlandMansionStructure#postPlace after
COMMENT the mansion placement}.
METHOD method_15029 addPieces (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Ljava/util/List;Lnet/minecraft/class_5819;)V
ARG 0 manager
diff --git a/mappings/net/minecraft/tag/TagPacketSerializer.mapping b/mappings/net/minecraft/tag/TagPacketSerializer.mapping
index 50609f4ff3..4b03f56f03 100644
--- a/mappings/net/minecraft/tag/TagPacketSerializer.mapping
+++ b/mappings/net/minecraft/tag/TagPacketSerializer.mapping
@@ -15,8 +15,8 @@ CLASS net/minecraft/class_6864 net/minecraft/tag/TagPacketSerializer
ARG 4 rawIds
CLASS class_5748 Serialized
COMMENT A serialization-friendly POJO representation of a {@linkplain
- COMMENT RegistryEntryList registry entry list} of tags. This allows easy transport
- COMMENT of tags over Minecraft network protocol.
+ COMMENT net.minecraft.util.registry.RegistryEntryList registry entry list} of tags.
+ COMMENT This allows easy transport of tags over Minecraft network protocol.
COMMENT
COMMENT This stores tag entries with raw integer IDs and requires a registry
COMMENT for raw ID access to serialize or deserialize tags.
diff --git a/mappings/net/minecraft/world/WorldEvents.mapping b/mappings/net/minecraft/world/WorldEvents.mapping
index cb07740475..70ea3ffb4b 100644
--- a/mappings/net/minecraft/world/WorldEvents.mapping
+++ b/mappings/net/minecraft/world/WorldEvents.mapping
@@ -8,7 +8,7 @@ CLASS net/minecraft/class_6088 net/minecraft/world/WorldEvents
COMMENT received on the client by {@link net.minecraft.client.network.ClientPlayNetworkHandler#onWorldEvent(net.minecraft.network.packet.s2c.play.WorldEventS2CPacket) ClientPlayNetworkHandler#onWorldEvent},
COMMENT synced by {@link net.minecraft.client.world.ClientWorld#syncWorldEvent(net.minecraft.entity.player.PlayerEntity, int, net.minecraft.util.math.BlockPos, int) ClientWorld#syncWorldEvent} and
COMMENT {@link net.minecraft.client.world.ClientWorld#syncGlobalEvent(int, net.minecraft.util.math.BlockPos, int) ClientWorld#syncGlobalEvent} (for regular and global events respectively), and
- COMMENT finally processed by {@link net.minecraft.client.render.WorldRenderer#processWorldEvent(net.minecraft.entity.player.PlayerEntity, int, net.minecraft.util.math.BlockPos, int) WorldRenderer#processWorldEvent} and
+ COMMENT finally processed by {@link net.minecraft.client.render.WorldRenderer#processWorldEvent(int, net.minecraft.util.math.BlockPos, int) WorldRenderer#processWorldEvent} and
COMMENT {@link net.minecraft.client.render.WorldRenderer#processGlobalEvent(int, net.minecraft.util.math.BlockPos, int) WorldRenderer#processGlobalEvent} (for regular and global events respectively).
FIELD field_31114 ZOMBIE_INFECTS_VILLAGER I
COMMENT A zombie infects a villager.
@@ -121,7 +121,7 @@ CLASS net/minecraft/class_6088 net/minecraft/world/WorldEvents
FIELD field_31139 REDSTONE_TORCH_BURNS_OUT I
COMMENT A redstone torch burns out.
COMMENT Called by {@link net.minecraft.block.RedstoneTorchBlock#scheduledTick(net.minecraft.block.BlockState, net.minecraft.server.world.ServerWorld, net.minecraft.util.math.BlockPos, java.util.Random) RedstoneTorchBlock#scheduledTick}
+ COMMENT Called by {@link net.minecraft.block.RedstoneTorchBlock#scheduledTick(net.minecraft.block.BlockState, net.minecraft.server.world.ServerWorld, net.minecraft.util.math.BlockPos, net.minecraft.util.math.random.AbstractRandom) RedstoneTorchBlock#scheduledTick}
FIELD field_31140 DISPENSER_DISPENSES I
COMMENT A dispenser dispenses an item.
COMMENT
Plays the redstone torch burn out sound event and spawns smoke particles.
- COMMENT
Plays the dispensing sound event.
@@ -156,7 +156,7 @@ CLASS net/minecraft/class_6088 net/minecraft/world/WorldEvents
COMMENT {@link net.minecraft.entity.passive.RabbitEntity.EatCarrotCropGoal#tick() RabbitEntity.EatCarrotCropGoal#tick},
COMMENT {@link net.minecraft.block.SpongeBlock#update(net.minecraft.world.World, net.minecraft.util.math.BlockPos) SpongeBlock#update},
COMMENT {@link net.minecraft.block.TurtleEggBlock#breakEgg(net.minecraft.world.World, net.minecraft.util.math.BlockPos, net.minecraft.block.BlockState) TurtleEggBlock#breakEgg},
- COMMENT {@link net.minecraft.block.TurtleEggBlock#randomTick(net.minecraft.block.BlockState, net.minecraft.server.world.ServerWorld, net.minecraft.util.math.BlockPos, java.util.Random) TurtleEggBlock#randomTick},
+ COMMENT {@link net.minecraft.block.TurtleEggBlock#randomTick(net.minecraft.block.BlockState, net.minecraft.server.world.ServerWorld, net.minecraft.util.math.BlockPos, net.minecraft.util.math.random.AbstractRandom) TurtleEggBlock#randomTick},
COMMENT {@link net.minecraft.entity.passive.TurtleEntity#tickMovement() TurtleEntity#tickMovement},
COMMENT {@link net.minecraft.block.WitherSkullBlock#onPlaced(net.minecraft.world.World, net.minecraft.util.math.BlockPos, net.minecraft.block.entity.SkullBlockEntity) WitherSkullBlock#onPlaced},
COMMENT and {@link net.minecraft.world.World#breakBlock(net.minecraft.util.math.BlockPos, boolean, net.minecraft.entity.Entity, int) World#breakBlock}
@@ -351,8 +351,8 @@ CLASS net/minecraft/class_6088 net/minecraft/world/WorldEvents
FIELD field_37586 SCULK_CHARGE I
COMMENT Sculk... charges? Sculk is weird.
COMMENT
Spawns sculk charge particles.
- COMMENT
Called by {@link net.minecraft.block.entity.SculkSpreadManager#tick(net.minecraft.world.World, net.minecraft.util.math.BlockPos, java.util.Random) SculkSpreadManager#tick}
+ COMMENT
Called by {@link net.minecraft.block.entity.SculkSpreadManager#tick(net.minecraft.world.World, net.minecraft.util.math.BlockPos, net.minecraft.util.math.random.AbstractRandom, boolean) SculkSpreadManager#tick}
FIELD field_38228 SCULK_SHRIEKS I
COMMENT A sculk shrieker shrieks.
COMMENT
Spawns shriek particles and plays the shriek sound event.
- COMMENT
Called by {@link net.minecraft.block.SculkShriekerBlock#shriek(net.minecraft.world.World, net.minecraft.block.BlockState, net.minecraft.util.math.BlockPos) SculkShriekerBlock#shriek}
+ COMMENT
Called by {@link net.minecraft.block.entity.SculkShriekerBlockEntity#shriek(net.minecraft.server.world.ServerWorld, net.minecraft.entity.Entity) SculkShriekerBlockEntity#shriek}
diff --git a/mappings/net/minecraft/world/biome/source/util/VanillaBiomeParameters.mapping b/mappings/net/minecraft/world/biome/source/util/VanillaBiomeParameters.mapping
index 0cf3b1a7a2..927db963d3 100644
--- a/mappings/net/minecraft/world/biome/source/util/VanillaBiomeParameters.mapping
+++ b/mappings/net/minecraft/world/biome/source/util/VanillaBiomeParameters.mapping
@@ -125,3 +125,12 @@ CLASS net/minecraft/class_6554 net/minecraft/world/biome/source/util/VanillaBiom
METHOD method_40012 getErosionParameters ()[Lnet/minecraft/class_6544$class_6546;
METHOD method_40013 getContinentalnessParameters ()[Lnet/minecraft/class_6544$class_6546;
METHOD method_40014 getWeirdnessParameters ()[Lnet/minecraft/class_6544$class_6546;
+ METHOD method_41419 writeDeepDarkParameters (Ljava/util/function/Consumer;Lnet/minecraft/class_6544$class_6546;Lnet/minecraft/class_6544$class_6546;Lnet/minecraft/class_6544$class_6546;Lnet/minecraft/class_6544$class_6546;Lnet/minecraft/class_6544$class_6546;FLnet/minecraft/class_5321;)V
+ ARG 1 parameters
+ ARG 2 temperature
+ ARG 3 humidity
+ ARG 4 continentalness
+ ARG 5 erosion
+ ARG 6 weirdness
+ ARG 7 offset
+ ARG 8 biome
diff --git a/mappings/net/minecraft/world/event/listener/EntityGameEventHandler.mapping b/mappings/net/minecraft/world/event/listener/EntityGameEventHandler.mapping
index bc852df636..7bfe56ad4b 100644
--- a/mappings/net/minecraft/world/event/listener/EntityGameEventHandler.mapping
+++ b/mappings/net/minecraft/world/event/listener/EntityGameEventHandler.mapping
@@ -2,11 +2,6 @@ CLASS net/minecraft/class_5715 net/minecraft/world/event/listener/EntityGameEven
COMMENT A game event handler for an entity so that the listener stored can be
COMMENT moved to the correct dispatcher or unregistered as the entity moves or
COMMENT gets removed.
- COMMENT
- COMMENT @apiNote This implementation is currently unused by vanilla as vanilla
- COMMENT doesn't have any entity that listens to game events.
- COMMENT
- COMMENT @see net.minecraft.entity.Entity#getGameEventHandler()
FIELD field_28182 listener Lnet/minecraft/class_5714;
FIELD field_28183 sectionPos Lnet/minecraft/class_4076;
METHOD