.editorconfig

@@ -1,32 +1,34 @@
+root = true
+
 [*]
-charset=utf-8
+charset = utf-8
-end_of_line=lf
+end_of_line = lf
-insert_final_newline=true
+insert_final_newline = true
-indent_style=space
+indent_style = space
-indent_size=4
+indent_size = 4
 ij_any_block_comment_add_space = false
 ij_any_block_comment_at_first_column = false
 ij_any_line_comment_at_first_column = false
 ij_any_line_comment_add_space = true
 
 [*.tiny]
-indent_style=tab
+indent_style = tab
 
 [*.bat]
-end_of_line=crlf
+end_of_line = crlf
 
 [*.yml]
-indent_size=2
+indent_size = 2
 
 [*.patch]
-trim_trailing_whitespace=false
+trim_trailing_whitespace = false
 
 [*.java]
 ij_continuation_indent_size = 4
 ij_java_class_count_to_use_import_on_demand = 999999
 ij_java_insert_inner_class_imports = false
 ij_java_names_count_to_use_import_on_demand = 999999
-ij_java_imports_layout = *,|,$*
+ij_java_imports_layout = *, |, $*
 ij_java_generate_final_locals = true
 ij_java_generate_final_parameters = true
 ij_java_method_parameters_new_line_after_left_paren = true
@@ -40,5 +42,5 @@ ij_java_use_fq_class_names = true
 [paper-server/src/minecraft/resources/data/**/*.json]
 indent_size = 2
 
-[paper-api-generator/generated/**/*.java]
+[paper-{server,api}/src/generated/java/**/*.java]
-ij_java_imports_layout = $*,|,*
+ij_java_imports_layout = $*, |, *

.github/workflows/build.yml

@@ -35,6 +35,10 @@ jobs:
     steps:
       - if: ${{ github.event_name == 'push' }}
         uses: actions/checkout@v4
+        with:
+          # todo remove me again after the update
+          ref: ${{ github.ref_name }}
+          fetch-depth: 0
       - if: ${{ github.event_name == 'pull_request' }}
         uses: actions/checkout@v4
         with:

.github/workflows/projects.yml

@@ -18,10 +18,11 @@ jobs:
     steps:
       - name: "authenticate"
         id: "authenticate"
-        uses: "tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92" # v1
+        uses: "tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a" # v2.1.0
         with:
+          installation_retrieval_mode: id
+          installation_retrieval_payload: "36153445"
           app_id: "${{ secrets.PROJECTS_APP_ID }}"
-          installation_id: "36153445"
           private_key: "${{ secrets.PROJECTS_PRIVATE_KEY }}"
 
       - uses: PaperMC/update-projects-action@v0.2.0

.gitignore

@@ -45,7 +45,7 @@ logs/
 !gradle/wrapper/gradle-wrapper.jar
 
 test-plugin.settings.gradle.kts
-paper-api-generator.settings.gradle.kts
+paper-generator.settings.gradle.kts
 
 # Don't track patched vanilla submodules
 paper-server/src/minecraft/

CONTRIBUTING.md

@@ -208,7 +208,8 @@ required.
   with `// Paper end - <COMMIT DESCRIPTION>`.
 - One-line changes should have `// Paper - <COMMIT DESCRIPTION>` at the end of the line.
 
-> [!NOTE] These comments are incredibly important to be able to keep track of changes
+> [!NOTE]
+> These comments are incredibly important to be able to keep track of changes
 > across files and to remember what they are for, even a decade into the future.
 
 Here's an example of how to mark changes by Paper:
@@ -263,6 +264,40 @@ are assumed to be non-null by default. For less obvious placing such as on gener
 **For other classes**: Keep using both `@Nullable` and `@NotNull` from `org.jetbrains.annotations`. These
 will be replaced later.
 
+### API checks
+
+When performing API-related checks where an exception needs to be thrown under specific conditions, you should use the `Preconditions` class.
+
+#### Checking Method Arguments
+To validate method arguments, use `Preconditions#checkArgument`. This will throw an `IllegalArgumentException` if the condition is not met.
+> Don't use Preconditions#checkNotNull, as it throws a NullPointerException, which makes it harder to determine whether the error was caused by an internal issue or invalid arguments.
+
+ex:
+```java
+@Override
+public void sendMessage(Player player, Component message) {
+    Preconditions.checkArgument(player != null, "player cannot be null");
+    Preconditions.checkArgument(player.isOnline(), "player %s must be online", player.getName());
+    Preconditions.checkArgument(message != null, "message cannot be null");
+    // rest of code
+}
+```
+
+#### Checking Object State
+To validate the state of an object inside a method, use `Preconditions#checkState`. This will throw an `IllegalStateException` if the condition is not met.
+ex:
+```java
+private Player player;
+
+@Override
+public void sendMessage(Component message) {
+    Preconditions.checkArgument(message != null, "message cannot be null");
+    Preconditions.checkState(this.player != null, "player cannot be null");
+    Preconditions.checkState(this.player.isOnline(), "player %s must be online", this.player.getName());
+    // rest of code
+}
+```
+
 ## Access Transformers
 Sometimes, Vanilla code already contains a field, method, or type you want to access
 but the visibility is too low (e.g. a private field in an entity class). Paper can use access transformers

README.md

@@ -40,7 +40,7 @@ How To (Plugin Developers)
 <dependency>
     <groupId>io.papermc.paper</groupId>
     <artifactId>paper-api</artifactId>
-    <version>1.21.4-R0.1-SNAPSHOT</version>
+    <version>1.21.5-R0.1-SNAPSHOT</version>
     <scope>provided</scope>
 </dependency>
 ```
@@ -53,7 +53,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT")
+    compileOnly("io.papermc.paper:paper-api:1.21.5-R0.1-SNAPSHOT")
 }
 
 java {

build-data/paper.at

@@ -15,7 +15,8 @@ public net.minecraft.commands.CommandSourceStack source
 public net.minecraft.commands.arguments.DimensionArgument ERROR_INVALID_VALUE
 public net.minecraft.commands.arguments.blocks.BlockInput tag
 public net.minecraft.core.MappedRegistry validateWrite(Lnet/minecraft/resources/ResourceKey;)V
-public net.minecraft.nbt.ListTag <init>(Ljava/util/List;B)V
+public net.minecraft.nbt.ListTag <init>(Ljava/util/List;)V
+public net.minecraft.nbt.ListTag identifyRawElementType()B
 public net.minecraft.nbt.TagParser readArrayTag()Lnet/minecraft/nbt/Tag;
 public net.minecraft.nbt.TagParser type(Ljava/lang/String;)Lnet/minecraft/nbt/Tag;
 public net.minecraft.network.Connection address
@@ -37,9 +38,10 @@ public net.minecraft.network.protocol.game.ServerboundMovePlayerPacket xRot
 public net.minecraft.network.protocol.game.ServerboundMovePlayerPacket y
 public net.minecraft.network.protocol.game.ServerboundMovePlayerPacket yRot
 public net.minecraft.network.protocol.game.ServerboundMovePlayerPacket z
+public net.minecraft.network.syncher.SynchedEntityData getItem(Lnet/minecraft/network/syncher/EntityDataAccessor;)Lnet/minecraft/network/syncher/SynchedEntityData$DataItem;
 public net.minecraft.resources.RegistryOps lookupProvider
 public net.minecraft.resources.RegistryOps$HolderLookupAdapter
-public net.minecraft.server.Main forceUpgrade(Lnet/minecraft/world/level/storage/LevelStorageSource$LevelStorageAccess;Lcom/mojang/datafixers/DataFixer;ZLjava/util/function/BooleanSupplier;Lnet/minecraft/core/RegistryAccess;Z)V
+public net.minecraft.server.Main forceUpgrade(Lnet/minecraft/world/level/storage/LevelStorageSource$LevelStorageAccess;Lnet/minecraft/world/level/storage/WorldData;Lcom/mojang/datafixers/DataFixer;ZLjava/util/function/BooleanSupplier;Lnet/minecraft/core/RegistryAccess;Z)V
 public net.minecraft.server.MinecraftServer LOGGER
 public net.minecraft.server.MinecraftServer doRunTask(Lnet/minecraft/server/TickTask;)V
 public net.minecraft.server.MinecraftServer executor
@@ -53,6 +55,7 @@ public net.minecraft.server.MinecraftServer$ReloadableResources
 public net.minecraft.server.RegistryLayer STATIC_ACCESS
 public net.minecraft.server.ReloadableServerResources
 public net.minecraft.server.ServerAdvancementManager advancements
+public net.minecraft.server.Services USERID_CACHE_FILE
 public net.minecraft.server.dedicated.DedicatedServerProperties$WorldDimensionData
 public net.minecraft.server.dedicated.Settings getStringRaw(Ljava/lang/String;)Ljava/lang/String;
 public net.minecraft.server.dedicated.Settings properties
@@ -72,15 +75,17 @@ public net.minecraft.server.level.ChunkMap setServerViewDistance(I)V
 public net.minecraft.server.level.ChunkMap toDrop
 public net.minecraft.server.level.ChunkMap updatingChunkMap
 public net.minecraft.server.level.ChunkMap visibleChunkMap
+public net.minecraft.server.level.ChunkMap$DistanceManager
 public net.minecraft.server.level.ChunkMap$TrackedEntity
 public net.minecraft.server.level.ChunkMap$TrackedEntity seenBy
 public net.minecraft.server.level.ChunkMap$TrackedEntity serverEntity
 public net.minecraft.server.level.DistanceManager simulationDistance
-public net.minecraft.server.level.DistanceManager tickets
+public net.minecraft.server.level.DistanceManager ticketStorage
 public net.minecraft.server.level.ServerBossEvent broadcast(Ljava/util/function/Function;)V
 public net.minecraft.server.level.ServerBossEvent visible
 public net.minecraft.server.level.ServerChunkCache mainThread
 public net.minecraft.server.level.ServerChunkCache mainThreadProcessor
+public net.minecraft.server.level.ServerChunkCache runDistanceManagerUpdates()Z
 public net.minecraft.server.level.ServerChunkCache spawnEnemies
 public net.minecraft.server.level.ServerChunkCache spawnFriendlies
 public net.minecraft.server.level.ServerChunkCache$MainThreadExecutor
@@ -91,7 +96,7 @@ public net.minecraft.server.level.ServerLevel getEntities()Lnet/minecraft/world/
 public net.minecraft.server.level.ServerLevel serverLevelData
 public net.minecraft.server.level.ServerPlayer completeUsingItem()V
 public net.minecraft.server.level.ServerPlayer containerSynchronizer
-public net.minecraft.server.level.ServerPlayer findRespawnAndUseSpawnBlock(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;FZZ)Ljava/util/Optional;
+public net.minecraft.server.level.ServerPlayer findRespawnAndUseSpawnBlock(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/server/level/ServerPlayer$RespawnConfig;Z)Ljava/util/Optional;
 public net.minecraft.server.level.ServerPlayer initMenu(Lnet/minecraft/world/inventory/AbstractContainerMenu;)V
 public net.minecraft.server.level.ServerPlayer isChangingDimension
 public net.minecraft.server.level.ServerPlayer language
@@ -104,6 +109,7 @@ public net.minecraft.server.level.ServerPlayer wardenSpawnTracker
 public net.minecraft.server.level.ServerPlayer$RespawnPosAngle
 public net.minecraft.server.level.ServerPlayerGameMode level
 public net.minecraft.server.level.Ticket key
+public net.minecraft.server.level.TicketType register(Ljava/lang/String;JZLnet/minecraft/server/level/TicketType$TicketUse;)Lnet/minecraft/server/level/TicketType;
 public net.minecraft.server.network.ServerGamePacketListenerImpl isChatMessageIllegal(Ljava/lang/String;)Z
 public net.minecraft.server.network.ServerLoginPacketListenerImpl authenticatedProfile
 public net.minecraft.server.network.ServerLoginPacketListenerImpl connection
@@ -116,12 +122,14 @@ public net.minecraft.server.packs.repository.Pack resources
 public net.minecraft.server.players.PlayerList playerIo
 public net.minecraft.server.players.PlayerList players
 public net.minecraft.server.players.PlayerList updateEntireScoreboard(Lnet/minecraft/server/ServerScoreboard;Lnet/minecraft/server/level/ServerPlayer;)V
+public net.minecraft.server.players.PlayerList verifyChatTrusted(Lnet/minecraft/network/chat/PlayerChatMessage;)Z
 public net.minecraft.server.players.StoredUserEntry getUser()Ljava/lang/Object;
 public net.minecraft.stats.ServerRecipeBook known
 public net.minecraft.tags.TagEntry id
 public net.minecraft.tags.TagEntry required
 public net.minecraft.tags.TagEntry tag
-public net.minecraft.util.datafix.fixes.BlockStateData register(ILjava/lang/String;[Ljava/lang/String;)V
+public net.minecraft.util.datafix.fixes.BlockStateData register(ILcom/mojang/serialization/Dynamic;[Lcom/mojang/serialization/Dynamic;)V
+public net.minecraft.util.datafix.fixes.EntityCustomNameToComponentFix fixCustomName(Lcom/mojang/serialization/DynamicOps;Ljava/lang/String;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic;
 public net.minecraft.util.datafix.fixes.ItemIdFix ITEM_NAMES
 public net.minecraft.util.datafix.fixes.ItemSpawnEggFix ID_TO_ENTITY
 public net.minecraft.world.BossEvent color
@@ -185,7 +193,11 @@ public net.minecraft.world.entity.Entity FLAG_INVISIBLE
 public net.minecraft.world.entity.Entity getEncodeId()Ljava/lang/String;
 public net.minecraft.world.entity.Entity getFireImmuneTicks()I
 public net.minecraft.world.entity.Entity getSharedFlag(I)Z
+public net.minecraft.world.entity.Entity getSwimHighSpeedSplashSound()Lnet/minecraft/sounds/SoundEvent;
+public net.minecraft.world.entity.Entity getSwimSound()Lnet/minecraft/sounds/SoundEvent;
+public net.minecraft.world.entity.Entity getSwimSplashSound()Lnet/minecraft/sounds/SoundEvent;
 public net.minecraft.world.entity.Entity hasVisualFire
+public net.minecraft.world.entity.Entity isAffectedByBlocks()Z
 public net.minecraft.world.entity.Entity isInBubbleColumn()Z
 public net.minecraft.world.entity.Entity isInRain()Z
 public net.minecraft.world.entity.Entity isInvulnerableToBase(Lnet/minecraft/world/damagesource/DamageSource;)Z
@@ -196,9 +208,11 @@ public net.minecraft.world.entity.Entity random
 public net.minecraft.world.entity.Entity setLevel(Lnet/minecraft/world/level/Level;)V
 public net.minecraft.world.entity.Entity setRot(FF)V
 public net.minecraft.world.entity.Entity setSharedFlag(IZ)V
+public net.minecraft.world.entity.Entity teleportPassengers()V
 public net.minecraft.world.entity.Entity unsetRemoved()V
 public net.minecraft.world.entity.Entity wasTouchingWater
 public net.minecraft.world.entity.ExperienceOrb count
+public net.minecraft.world.entity.ExperienceOrb setValue(I)V
 public net.minecraft.world.entity.ExperienceOrb value
 public net.minecraft.world.entity.GlowSquid setDarkTicks(I)V
 public net.minecraft.world.entity.Interaction attack
@@ -225,16 +239,21 @@ public net.minecraft.world.entity.LivingEntity detectEquipmentUpdates()V
 public net.minecraft.world.entity.LivingEntity effectsDirty
 public net.minecraft.world.entity.LivingEntity entityEventForEquipmentBreak(Lnet/minecraft/world/entity/EquipmentSlot;)B
 public net.minecraft.world.entity.LivingEntity getDeathSound()Lnet/minecraft/sounds/SoundEvent;
+public net.minecraft.world.entity.LivingEntity getFallDamageSound(I)Lnet/minecraft/sounds/SoundEvent;
+public net.minecraft.world.entity.LivingEntity getHurtSound(Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent;
 public net.minecraft.world.entity.LivingEntity getSoundVolume()F
 public net.minecraft.world.entity.LivingEntity jumping
 public net.minecraft.world.entity.LivingEntity lastHurt
 public net.minecraft.world.entity.LivingEntity lastHurtByMob
 public net.minecraft.world.entity.LivingEntity lastHurtByMobTimestamp
 public net.minecraft.world.entity.LivingEntity lastHurtByPlayer
+public net.minecraft.world.entity.LivingEntity lastHurtByPlayerMemoryTime
 public net.minecraft.world.entity.LivingEntity lastHurtByPlayerTime
+public net.minecraft.world.entity.LivingEntity playSecondaryHurtSound(Lnet/minecraft/world/damagesource/DamageSource;)V
 public net.minecraft.world.entity.LivingEntity setLivingEntityFlag(IZ)V
 public net.minecraft.world.entity.LivingEntity useItemRemaining
 public net.minecraft.world.entity.Mob armorDropChances
+public net.minecraft.world.entity.Mob getAmbientSound()Lnet/minecraft/sounds/SoundEvent;
 public net.minecraft.world.entity.Mob getEquipmentDropChance(Lnet/minecraft/world/entity/EquipmentSlot;)F
 public net.minecraft.world.entity.Mob handDropChances
 public net.minecraft.world.entity.Mob isSunBurnTick()Z
@@ -264,47 +283,60 @@ public net.minecraft.world.entity.animal.Bee ticksWithoutNectarSinceExitingHive
 public net.minecraft.world.entity.animal.Cat isRelaxStateOne()Z
 public net.minecraft.world.entity.animal.Cat setCollarColor(Lnet/minecraft/world/item/DyeColor;)V
 public net.minecraft.world.entity.animal.Cat setRelaxStateOne(Z)V
+public net.minecraft.world.entity.animal.Cat setVariant(Lnet/minecraft/core/Holder;)V
+public net.minecraft.world.entity.animal.Dolphin treasurePos
 public net.minecraft.world.entity.animal.Fox DATA_TRUSTED_ID_0
 public net.minecraft.world.entity.animal.Fox DATA_TRUSTED_ID_1
 public net.minecraft.world.entity.animal.Fox isDefending()Z
 public net.minecraft.world.entity.animal.Fox setDefending(Z)V
 public net.minecraft.world.entity.animal.Fox setFaceplanted(Z)V
 public net.minecraft.world.entity.animal.Fox setSleeping(Z)V
+public net.minecraft.world.entity.animal.Fox setVariant(Lnet/minecraft/world/entity/animal/Fox$Variant;)V
+public net.minecraft.world.entity.animal.MushroomCow setVariant(Lnet/minecraft/world/entity/animal/MushroomCow$Variant;)V
 public net.minecraft.world.entity.animal.MushroomCow stewEffects
 public net.minecraft.world.entity.animal.Ocelot isTrusting()Z
 public net.minecraft.world.entity.animal.Ocelot setTrusting(Z)V
 public net.minecraft.world.entity.animal.Panda getEatCounter()I
 public net.minecraft.world.entity.animal.Panda setEatCounter(I)V
+public net.minecraft.world.entity.animal.Parrot setVariant(Lnet/minecraft/world/entity/animal/Parrot$Variant;)V
+public net.minecraft.world.entity.animal.Pig setVariant(Lnet/minecraft/core/Holder;)V
 public net.minecraft.world.entity.animal.Pig steering
 public net.minecraft.world.entity.animal.Rabbit moreCarrotTicks
 public net.minecraft.world.entity.animal.Rabbit registerGoals()V
+public net.minecraft.world.entity.animal.Rabbit setVariant(Lnet/minecraft/world/entity/animal/Rabbit$Variant;)V
+public net.minecraft.world.entity.animal.Salmon setVariant(Lnet/minecraft/world/entity/animal/Salmon$Variant;)V
 public net.minecraft.world.entity.animal.TropicalFish getPackedVariant()I
 public net.minecraft.world.entity.animal.TropicalFish setPackedVariant(I)V
-public net.minecraft.world.entity.animal.Turtle getHomePos()Lnet/minecraft/core/BlockPos;
+public net.minecraft.world.entity.animal.Turtle goingHome
-public net.minecraft.world.entity.animal.Turtle isGoingHome()Z
+public net.minecraft.world.entity.animal.Turtle homePos
-public net.minecraft.world.entity.animal.Turtle isTravelling()Z
-public net.minecraft.world.entity.animal.Turtle setGoingHome(Z)V
 public net.minecraft.world.entity.animal.Turtle setHasEgg(Z)V
-public net.minecraft.world.entity.animal.Turtle setTravelling(Z)V
-public net.minecraft.world.entity.animal.Wolf isWet
-public net.minecraft.world.entity.animal.Wolf setCollarColor(Lnet/minecraft/world/item/DyeColor;)V
 public net.minecraft.world.entity.animal.allay.Allay canDuplicate()Z
 public net.minecraft.world.entity.animal.allay.Allay duplicateAllay()V
 public net.minecraft.world.entity.animal.allay.Allay duplicationCooldown
 public net.minecraft.world.entity.animal.allay.Allay jukeboxPos
 public net.minecraft.world.entity.animal.allay.Allay resetDuplicationCooldown()V
+public net.minecraft.world.entity.animal.axolotl.Axolotl setVariant(Lnet/minecraft/world/entity/animal/axolotl/Axolotl$Variant;)V
+public net.minecraft.world.entity.animal.frog.Frog setVariant(Lnet/minecraft/core/Holder;)V
 public net.minecraft.world.entity.animal.frog.Tadpole age
 public net.minecraft.world.entity.animal.goat.Goat DATA_HAS_LEFT_HORN
 public net.minecraft.world.entity.animal.goat.Goat DATA_HAS_RIGHT_HORN
 public net.minecraft.world.entity.animal.horse.AbstractHorse createInventory()V
 public net.minecraft.world.entity.animal.horse.AbstractHorse inventory
+public net.minecraft.world.entity.animal.horse.AbstractHorse owner
 public net.minecraft.world.entity.animal.horse.Horse setVariantAndMarkings(Lnet/minecraft/world/entity/animal/horse/Variant;Lnet/minecraft/world/entity/animal/horse/Markings;)V
+public net.minecraft.world.entity.animal.horse.Llama setVariant(Lnet/minecraft/world/entity/animal/horse/Llama$Variant;)V
 public net.minecraft.world.entity.animal.horse.SkeletonHorse trapTime
 public net.minecraft.world.entity.animal.sniffer.Sniffer calculateDigPosition()Ljava/util/Optional;
 public net.minecraft.world.entity.animal.sniffer.Sniffer canDig()Z
 public net.minecraft.world.entity.animal.sniffer.Sniffer getExploredPositions()Ljava/util/stream/Stream;
 public net.minecraft.world.entity.animal.sniffer.Sniffer getState()Lnet/minecraft/world/entity/animal/sniffer/Sniffer$State;
 public net.minecraft.world.entity.animal.sniffer.Sniffer storeExploredPosition(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/entity/animal/sniffer/Sniffer;
+public net.minecraft.world.entity.animal.wolf.Wolf getSoundVariant()Lnet/minecraft/core/Holder;
+public net.minecraft.world.entity.animal.wolf.Wolf getVariant()Lnet/minecraft/core/Holder;
+public net.minecraft.world.entity.animal.wolf.Wolf isWet
+public net.minecraft.world.entity.animal.wolf.Wolf setCollarColor(Lnet/minecraft/world/item/DyeColor;)V
+public net.minecraft.world.entity.animal.wolf.Wolf setSoundVariant(Lnet/minecraft/core/Holder;)V
+public net.minecraft.world.entity.animal.wolf.Wolf setVariant(Lnet/minecraft/core/Holder;)V
 public net.minecraft.world.entity.boss.enderdragon.EnderDragon subEntities
 public net.minecraft.world.entity.boss.wither.WitherBoss bossEvent
 public net.minecraft.world.entity.decoration.ArmorStand bodyPose
@@ -323,6 +355,7 @@ public net.minecraft.world.entity.decoration.ItemFrame DATA_ROTATION
 public net.minecraft.world.entity.decoration.ItemFrame dropChance
 public net.minecraft.world.entity.decoration.ItemFrame fixed
 public net.minecraft.world.entity.decoration.ItemFrame setDirection(Lnet/minecraft/core/Direction;)V
+public net.minecraft.world.entity.decoration.Painting setVariant(Lnet/minecraft/core/Holder;)V
 public net.minecraft.world.entity.item.FallingBlockEntity <init>(Lnet/minecraft/world/level/Level;DDDLnet/minecraft/world/level/block/state/BlockState;)V
 public net.minecraft.world.entity.item.FallingBlockEntity blockState
 public net.minecraft.world.entity.item.FallingBlockEntity cancelDrop
@@ -345,8 +378,8 @@ public net.minecraft.world.entity.monster.Drowned waterNavigation
 public net.minecraft.world.entity.monster.EnderMan teleport()Z
 public net.minecraft.world.entity.monster.EnderMan teleportTowards(Lnet/minecraft/world/entity/Entity;)Z
 public net.minecraft.world.entity.monster.Endermite life
-public net.minecraft.world.entity.monster.Evoker getWololoTarget()Lnet/minecraft/world/entity/animal/Sheep;
+public net.minecraft.world.entity.monster.Evoker getWololoTarget()Lnet/minecraft/world/entity/animal/sheep/Sheep;
-public net.minecraft.world.entity.monster.Evoker setWololoTarget(Lnet/minecraft/world/entity/animal/Sheep;)V
+public net.minecraft.world.entity.monster.Evoker setWololoTarget(Lnet/minecraft/world/entity/animal/sheep/Sheep;)V
 public net.minecraft.world.entity.monster.Guardian randomStrollGoal
 public net.minecraft.world.entity.monster.Guardian setActiveAttackTarget(I)V
 public net.minecraft.world.entity.monster.Guardian$GuardianAttackGoal
@@ -399,14 +432,25 @@ public net.minecraft.world.entity.npc.WanderingTrader getWanderTarget()Lnet/mine
 public net.minecraft.world.entity.player.Abilities flyingSpeed
 public net.minecraft.world.entity.player.Abilities walkingSpeed
 public net.minecraft.world.entity.player.Inventory compartments
+public net.minecraft.world.entity.player.Inventory equipment
 public net.minecraft.world.entity.player.Player DATA_PLAYER_MODE_CUSTOMISATION
 public net.minecraft.world.entity.player.Player closeContainer()V
 public net.minecraft.world.entity.player.Player enchantmentSeed
 public net.minecraft.world.entity.player.Player getFireImmuneTicks()I
+public net.minecraft.world.entity.player.Player hurtDir
 public net.minecraft.world.entity.player.Player removeEntitiesOnShoulder()V
 public net.minecraft.world.entity.player.Player setShoulderEntityLeft(Lnet/minecraft/nbt/CompoundTag;)V
 public net.minecraft.world.entity.player.Player setShoulderEntityRight(Lnet/minecraft/nbt/CompoundTag;)V
 public net.minecraft.world.entity.player.Player sleepCounter
+public net.minecraft.world.entity.projectile.AbstractArrow baseDamage
+public net.minecraft.world.entity.projectile.AbstractArrow firedFromWeapon
+public net.minecraft.world.entity.projectile.AbstractArrow getHitGroundSoundEvent()Lnet/minecraft/sounds/SoundEvent;
+public net.minecraft.world.entity.projectile.AbstractArrow getPickupItem()Lnet/minecraft/world/item/ItemStack;
+public net.minecraft.world.entity.projectile.AbstractArrow isInGround()Z
+public net.minecraft.world.entity.projectile.AbstractArrow life
+public net.minecraft.world.entity.projectile.AbstractArrow pickupItemStack
+public net.minecraft.world.entity.projectile.AbstractArrow setPickupItemStack(Lnet/minecraft/world/item/ItemStack;)V
+public net.minecraft.world.entity.projectile.AbstractArrow setPierceLevel(B)V
 public net.minecraft.world.entity.projectile.AbstractHurtingProjectile assignDirectionalMovement(Lnet/minecraft/world/phys/Vec3;D)V
 public net.minecraft.world.entity.projectile.Arrow NO_EFFECT_COLOR
 public net.minecraft.world.entity.projectile.Arrow getPotionContents()Lnet/minecraft/world/item/alchemy/PotionContents;
@@ -447,6 +491,7 @@ public net.minecraft.world.entity.projectile.ShulkerBullet targetDeltaX
 public net.minecraft.world.entity.projectile.ShulkerBullet targetDeltaY
 public net.minecraft.world.entity.projectile.ShulkerBullet targetDeltaZ
 public net.minecraft.world.entity.projectile.SpectralArrow duration
+public net.minecraft.world.entity.projectile.ThrowableItemProjectile getDefaultItem()Lnet/minecraft/world/item/Item;
 public net.minecraft.world.entity.projectile.ThrownPotion isLingering()Z
 public net.minecraft.world.entity.projectile.ThrownTrident dealtDamage
 public net.minecraft.world.entity.projectile.windcharge.AbstractWindCharge explode(Lnet/minecraft/world/phys/Vec3;)V
@@ -460,7 +505,6 @@ public net.minecraft.world.entity.raid.Raid ticksActive
 public net.minecraft.world.entity.raid.Raid totalHealth
 public net.minecraft.world.entity.raid.Raider$HoldGroundAttackGoal
 public net.minecraft.world.entity.raid.Raids raidMap
-public net.minecraft.world.entity.vehicle.AbstractBoat getDropItem()Lnet/minecraft/world/item/Item;
 public net.minecraft.world.entity.vehicle.AbstractBoat getStatus()Lnet/minecraft/world/entity/vehicle/AbstractBoat$Status;
 public net.minecraft.world.entity.vehicle.AbstractBoat status
 public net.minecraft.world.entity.vehicle.AbstractMinecartContainer lootTable
@@ -471,6 +515,7 @@ public net.minecraft.world.entity.vehicle.MinecartTNT explode(D)V
 public net.minecraft.world.entity.vehicle.MinecartTNT explosionPowerBase
 public net.minecraft.world.entity.vehicle.MinecartTNT explosionSpeedFactor
 public net.minecraft.world.entity.vehicle.MinecartTNT fuse
+public net.minecraft.world.entity.vehicle.VehicleEntity getDropItem()Lnet/minecraft/world/item/Item;
 public net.minecraft.world.flag.FeatureFlag mask
 public net.minecraft.world.flag.FeatureFlag universe
 public net.minecraft.world.flag.FeatureFlagRegistry names
@@ -490,6 +535,9 @@ public net.minecraft.world.inventory.BrewingStandMenu brewingStandData
 public net.minecraft.world.inventory.CraftingMenu access
 public net.minecraft.world.inventory.DispenserMenu dispenser
 public net.minecraft.world.inventory.HorseInventoryMenu SLOT_BODY_ARMOR
+public net.minecraft.world.inventory.HorseInventoryMenu SLOT_HORSE_INVENTORY_START
+public net.minecraft.world.inventory.HorseInventoryMenu SLOT_SADDLE
+public net.minecraft.world.inventory.HorseInventoryMenu horse
 public net.minecraft.world.inventory.MerchantContainer selectionHint
 public net.minecraft.world.inventory.Slot slot
 public net.minecraft.world.item.AdventureModePredicate predicates
@@ -501,8 +549,9 @@ public net.minecraft.world.item.ItemCooldowns tickCount
 public net.minecraft.world.item.ItemCooldowns$CooldownInstance
 public net.minecraft.world.item.ItemStackLinkedSet TYPE_AND_TAG
 public net.minecraft.world.item.JukeboxSongPlayer song
-public net.minecraft.world.item.MapItem createNewSavedData(Lnet/minecraft/world/level/Level;IIIZZLnet/minecraft/resources/ResourceKey;)Lnet/minecraft/world/level/saveddata/maps/MapId;
+public net.minecraft.world.item.MapItem createNewSavedData(Lnet/minecraft/server/level/ServerLevel;IIIZZLnet/minecraft/resources/ResourceKey;)Lnet/minecraft/world/level/saveddata/maps/MapId;
 public net.minecraft.world.item.StandingAndWallBlockItem wallBlock
+public net.minecraft.world.item.component.BundleContents$Mutable getMaxAmountToAdd(Lnet/minecraft/world/item/ItemStack;)I
 public net.minecraft.world.item.component.ItemContainerContents MAX_SIZE
 public net.minecraft.world.item.component.ItemContainerContents items
 public net.minecraft.world.item.context.UseOnContext <init>(Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/phys/BlockHitResult;)V
@@ -526,7 +575,10 @@ public net.minecraft.world.level.BaseSpawner spawnCount
 public net.minecraft.world.level.BaseSpawner spawnDelay
 public net.minecraft.world.level.BaseSpawner spawnPotentials
 public net.minecraft.world.level.BaseSpawner spawnRange
+public net.minecraft.world.level.GameRules GAME_RULE_TYPES
+public net.minecraft.world.level.GameRules$Value deserialize(Ljava/lang/String;)V
 public net.minecraft.world.level.GameRules$Value onChanged(Lnet/minecraft/server/MinecraftServer;)V
+public net.minecraft.world.level.Level blockEntityTickers
 public net.minecraft.world.level.Level getEntities()Lnet/minecraft/world/level/entity/LevelEntityGetter;
 public net.minecraft.world.level.Level levelData
 public net.minecraft.world.level.Level rainLevel
@@ -534,6 +586,7 @@ public net.minecraft.world.level.Level thread
 public net.minecraft.world.level.Level thunderLevel
 public net.minecraft.world.level.NaturalSpawner SPAWNING_CATEGORIES
 public net.minecraft.world.level.StructureManager level
+public net.minecraft.world.level.TicketStorage tickets
 public net.minecraft.world.level.biome.Biome climateSettings
 public net.minecraft.world.level.biome.Biome getTemperature(Lnet/minecraft/core/BlockPos;I)F
 public net.minecraft.world.level.biome.Biome$ClimateSettings
@@ -558,6 +611,7 @@ public net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity cooking
 public net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity getTotalCookTime(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity;)I
 public net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity litTimeRemaining
 public net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity recipesUsed
+public net.minecraft.world.level.block.entity.BannerBlockEntity name
 public net.minecraft.world.level.block.entity.BarrelBlockEntity openersCounter
 public net.minecraft.world.level.block.entity.BarrelBlockEntity playSound(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/sounds/SoundEvent;)V
 public net.minecraft.world.level.block.entity.BarrelBlockEntity updateBlockState(Lnet/minecraft/world/level/block/state/BlockState;Z)V
@@ -602,6 +656,7 @@ public net.minecraft.world.level.block.entity.SculkSensorBlockEntity lastVibrati
 public net.minecraft.world.level.block.entity.SculkShriekerBlockEntity warningLevel
 public net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity openCount
 public net.minecraft.world.level.block.entity.SignBlockEntity playerWhoMayEdit
+public net.minecraft.world.level.block.entity.SkullBlockEntity customName
 public net.minecraft.world.level.block.entity.SkullBlockEntity noteBlockSound
 public net.minecraft.world.level.block.entity.SkullBlockEntity owner
 public net.minecraft.world.level.block.entity.StructureBlockEntity author
@@ -622,9 +677,16 @@ public net.minecraft.world.level.block.entity.TheEndGatewayBlockEntity exitPorta
 public net.minecraft.world.level.block.entity.TrialSpawnerBlockEntity trialSpawner
 public net.minecraft.world.level.block.entity.trialspawner.TrialSpawner isOminous
 public net.minecraft.world.level.block.entity.trialspawner.TrialSpawner stateAccessor
+public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerData cooldownEndsAt
 public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerData currentMobs
 public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerData detectedPlayers
+public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerData nextMobSpawnsAt
 public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerData nextSpawnData
+public net.minecraft.world.level.block.entity.vault.VaultBlockEntity serverData
+public net.minecraft.world.level.block.entity.vault.VaultServerData getRewardedPlayers()Ljava/util/Set;
+public net.minecraft.world.level.block.entity.vault.VaultServerData pauseStateUpdatingUntil(J)V
+public net.minecraft.world.level.block.entity.vault.VaultServerData stateUpdatingResumesAt()J
+public net.minecraft.world.level.block.entity.vault.VaultSharedData getConnectedPlayers()Ljava/util/Set;
 public net.minecraft.world.level.block.state.BlockBehaviour getMenuProvider(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/MenuProvider;
 public net.minecraft.world.level.block.state.BlockBehaviour hasCollision
 public net.minecraft.world.level.block.state.BlockBehaviour$BlockStateBase destroySpeed
@@ -638,6 +700,7 @@ public net.minecraft.world.level.chunk.LevelChunk level
 public net.minecraft.world.level.chunk.LevelChunk loaded
 public net.minecraft.world.level.chunk.LevelChunkSection states
 public net.minecraft.world.level.chunk.PalettedContainer registry
+public net.minecraft.world.level.chunk.status.ChunkStatusTasks postLoadProtoChunk(Lnet/minecraft/server/level/ServerLevel;Ljava/util/List;)V
 public net.minecraft.world.level.chunk.storage.EntityStorage entityDeserializerQueue
 public net.minecraft.world.level.chunk.storage.EntityStorage level
 public net.minecraft.world.level.chunk.storage.RegionFileStorage regionCache
@@ -670,6 +733,7 @@ public net.minecraft.world.level.levelgen.SurfaceRules$LazyCondition
 public net.minecraft.world.level.levelgen.SurfaceRules$LazyYCondition
 public net.minecraft.world.level.levelgen.SurfaceRules$SurfaceRule
 public net.minecraft.world.level.levelgen.SurfaceRules$VerticalGradientConditionSource
+public net.minecraft.world.level.levelgen.structure.StructurePiece SHAPE_CHECK_BLOCKS
 public net.minecraft.world.level.levelgen.structure.placement.StructurePlacement exclusionZone
 public net.minecraft.world.level.levelgen.structure.placement.StructurePlacement frequency
 public net.minecraft.world.level.levelgen.structure.placement.StructurePlacement frequencyReductionMethod
@@ -701,7 +765,6 @@ public-f net.minecraft.server.ReloadableServerResources commands
 public-f net.minecraft.server.dedicated.DedicatedServer serverLinks
 public-f net.minecraft.server.dedicated.DedicatedServer settings
 public-f net.minecraft.server.dedicated.DedicatedServerProperties pauseWhenEmptySeconds
-public-f net.minecraft.server.level.TicketType timeout
 public-f net.minecraft.server.players.PlayerList maxPlayers
 public-f net.minecraft.world.entity.LivingEntity combatTracker
 public-f net.minecraft.world.entity.LivingEntity invulnerableDuration
@@ -723,6 +786,7 @@ public-f net.minecraft.world.item.trading.MerchantOffer rewardExp
 public-f net.minecraft.world.item.trading.MerchantOffer xp
 public-f net.minecraft.world.level.LevelSettings hardcore
 public-f net.minecraft.world.level.LevelSettings levelName
+public-f net.minecraft.world.level.block.ChestBlock MENU_PROVIDER_COMBINER
 public-f net.minecraft.world.level.block.entity.BannerBlockEntity baseColor
 public-f net.minecraft.world.level.block.entity.trialspawner.TrialSpawner normalConfig
 public-f net.minecraft.world.level.block.entity.trialspawner.TrialSpawner ominousConfig

build.gradle.kts

@@ -1,18 +1,8 @@
-import io.papermc.paperweight.util.*
-import io.papermc.paperweight.util.constants.*
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
-import java.io.IOException
-import java.net.URI
-import java.nio.file.FileVisitResult
-import java.nio.file.Files
-import java.nio.file.SimpleFileVisitor
-import kotlin.io.path.*
-import java.nio.file.Path
-import kotlin.random.Random
 
 plugins {
-    id("io.papermc.paperweight.core") version "2.0.0-beta.10" apply false
+    id("io.papermc.paperweight.core") version "2.0.0-beta.16" apply false
 }
 
 subprojects {
@@ -38,6 +28,7 @@ subprojects {
         options.encoding = Charsets.UTF_8.name()
         options.release = 21
         options.isFork = true
+        options.compilerArgs.addAll(listOf("-Xlint:-deprecation", "-Xlint:-removal"))
     }
     tasks.withType<Javadoc> {
         options.encoding = Charsets.UTF_8.name()
@@ -81,248 +72,3 @@ tasks.register("printPaperVersion") {
         println(paperVersion.get())
     }
 }
-
-/*
-// Used when updating to a new Minecraft version
-tasks.register("pickUpdateDirectory") {
-    val issue = providers.gradleProperty("updateTaskListIssue").get()
-    val patchesFolder = layout.projectDirectory.dir("paper-server/patches/").convertToPath()
-    val storage = layout.cache.resolve("last-updating-folder").also { it.parent.createDirectories() }
-
-    doLast {
-        val html = URI(issue).toURL().readText()
-
-        val beginMarker = "```[tasklist]"
-        val start = html.indexOf(beginMarker)
-        val end = html.indexOf("```", start + beginMarker.length)
-        val taskList = html.substring(start + beginMarker.length, end)
-
-        // Extract all incomplete tasks and select a random one
-        val incompleteTasks = taskList.split("\\n").filter { it.startsWith("- [ ]") }.map { it.replace("- [ ] ", "") }
-        if (incompleteTasks.isEmpty()) {
-            error("No incomplete tasks found in the task list.")
-        }
-
-        val next = incompleteTasks[Random.nextInt(incompleteTasks.size)]
-
-        println("checking out $next...")
-        val dir = patchesFolder.resolve("unapplied").resolve(next)
-        if (!dir.exists()) {
-            error("Unapplied patch folder $next does not exist, did someone else already check it out and forgot to mark it?")
-        }
-        dir.listDirectoryEntries("*.patch").forEach { patch ->
-            patch.copyTo(patchesFolder.resolve("sources").resolve(next).resolve(patch.fileName).also { it.createDirectories() }, overwrite = true)
-            patch.deleteIfExists()
-        }
-        if (dir.listDirectoryEntries().isEmpty()) {
-            dir.deleteIfExists()
-        }
-
-        storage.writeText(next)
-        println("please tick the box in the issue: $issue")
-        println("if you don't finish it, uncheck the task again after you commited")
-    }
-}
-
-tasks.register("showUpdateDirectories") {
-    val patchDir = layout.projectDirectory.dir("paper-server/patches/unapplied/").convertToPath()
-
-    doLast {
-        Files.walkFileTree(patchDir, object : SimpleFileVisitor<Path>() {
-            override fun postVisitDirectory(dir: Path?, exc: IOException?): FileVisitResult {
-                dir?.takeIf { it.listDirectoryEntries("*.patch").isNotEmpty() }?.let {
-                    println("- [ ] ${patchDir.relativize(it).pathString.replace("\\", "/")}")
-                }
-                return FileVisitResult.CONTINUE
-            }
-        })
-    }
-}
-
-tasks.register("moveUpdateDirectory") {
-    notCompatibleWithConfigurationCache("This task is interactive")
-    fun expandUserHome(path: String): Path {
-        return Path.of(path.replaceFirst("^~".toRegex(), System.getProperty("user.home")))
-    }
-
-    val input = providers.fileContents(layout.projectDirectory.file("$CACHE_PATH/last-updating-folder")).asText.map { it.trim() }
-    val patchFolder = layout.projectDirectory.dir("paper-server/patches/sources").dir(input)
-    val sourceFolder = layout.projectDirectory.dir("paper-server/src/minecraft/java").dir(input)
-    val targetFolder = providers.gradleProperty("cleanPaperRepo").map {
-        expandUserHome(it).resolve(input.get())
-    }
-
-    fun copy(back: Boolean = false) {
-        patchFolder.path.listDirectoryEntries().forEach {
-            val relative = patchFolder.path.relativize(it).toString().replace(".patch", "")
-            val source = sourceFolder.path.resolve(relative)
-            val target = targetFolder.get().resolve(relative)
-            if (target.isDirectory()) { return@forEach }
-            if (back) {
-                target.copyTo(source, overwrite = true)
-            } else {
-                source.copyTo(target, overwrite = true)
-            }
-        }
-    }
-
-    doLast {
-        if (!targetFolder.isPresent) {
-            error("cleanPaperRepo is required, define it in gradle.properties")
-        }
-        copy()
-        val files = patchFolder.path.listDirectoryEntries().map { it.fileName.toString().replace(".patch", "") }
-        println("Copied $files from $sourceFolder to $targetFolder")
-        println("Make the files compile, then press enter to copy them back!")
-        System.`in`.read()
-        copy(back = true)
-        println("copied back!")
-    }
-}
-
-// see gradle.properties
-if (providers.gradleProperty("updatingMinecraft").getOrElse("false").toBoolean()) {
-    tasks.collectAtsFromPatches {
-        val dir = layout.projectDirectory.dir("patches/unapplied/server")
-        if (dir.path.isDirectory()) {
-            extraPatchDir = dir
-        }
-    }
-    tasks.withType<io.papermc.paperweight.tasks.RebuildGitPatches>().configureEach {
-        filterPatches = false
-    }
-    tasks.register("continueServerUpdate", RebasePatches::class) {
-        description = "Moves the next X patches from unapplied to applied, and applies them. X being the number of patches that apply cleanly, plus the terminal failure if any."
-        projectDir = project.projectDir
-        appliedPatches = file("patches/server")
-        unappliedPatches = file("patches/unapplied/server")
-        applyTaskName = "applyServerPatches"
-        patchedDir = "Paper-Server"
-    }
-}
-
-@UntrackedTask(because = "Does not make sense to track state")
-abstract class RebasePatches : BaseTask() {
-    @get:Internal
-    abstract val projectDir: DirectoryProperty
-
-    @get:InputFiles
-    abstract val appliedPatches: DirectoryProperty
-
-    @get:InputFiles
-    abstract val unappliedPatches: DirectoryProperty
-
-    @get:Input
-    abstract val applyTaskName: Property<String>
-
-    @get:Input
-    abstract val patchedDir: Property<String>
-
-    private fun unapplied(): List<Path> =
-        unappliedPatches.path.listDirectoryEntries("*.patch").sortedBy { it.name }
-
-    private fun appliedLoc(patch: Path): Path = appliedPatches.path.resolve(unappliedPatches.path.relativize(patch))
-
-    companion object {
-        val regex = Pattern.compile("Patch failed at ([0-9]{4}) (.*)")
-        val continuationRegex = Pattern.compile("^\\s{1}.+\$")
-        const val subjectPrefix = "Subject: [PATCH] "
-    }
-
-    @TaskAction
-    fun run() {
-        val patchedDirPath = projectDir.path.resolve(patchedDir.get())
-        if (patchedDirPath.isDirectory()) {
-            val status = Git(patchedDirPath)("status").getText()
-            if (status.contains("You are in the middle of an am session.")) {
-                throw PaperweightException("Cannot continue update when $patchedDirPath is in the middle of an am session.")
-            }
-        }
-
-        val unapplied = unapplied()
-        for (patch in unapplied) {
-            patch.copyTo(appliedLoc(patch))
-        }
-
-        val out = ByteArrayOutputStream()
-        val proc = ProcessBuilder()
-            .directory(projectDir.path)
-            .command("./gradlew", applyTaskName.get())
-            .redirectErrorStream(true)
-            .start()
-
-        val f = redirect(proc.inputStream, out)
-
-        val exit = proc.waitFor()
-        f.get()
-
-        if (exit != 0) {
-            val outStr = String(out.toByteArray())
-            val matcher = regex.matcher(outStr)
-            if (!matcher.find()) error("Could not determine failure point")
-            val failedSubjectFragment = matcher.group(2)
-            val failed = unapplied.single { p ->
-                p.useLines { lines ->
-                    val collect = mutableListOf<String>()
-                    for (line in lines) {
-                        if (line.startsWith(subjectPrefix)) {
-                            collect += line
-                        } else if (collect.size == 1) {
-                            if (continuationRegex.matcher(line).matches()) {
-                                collect += line
-                            } else {
-                                break
-                            }
-                        }
-                    }
-                    val subjectLine = collect.joinToString("").substringAfter(subjectPrefix)
-                    subjectLine.startsWith(failedSubjectFragment)
-                }
-            }
-
-            // delete successful & failure point from unapplied patches dir
-            for (path in unapplied) {
-                path.deleteIfExists()
-                if (path == failed) {
-                    break
-                }
-            }
-
-            // delete failed from patches dir
-            var started = false
-            for (path in unapplied) {
-                if (path == failed) {
-                    started = true
-                    continue
-                }
-                if (started) {
-                    appliedLoc(path).deleteIfExists()
-                }
-            }
-
-            // Delete the build file before resetting the AM session in case it has compilation errors
-            patchedDirPath.resolve("build.gradle.kts").deleteIfExists()
-            // Apply again to reset the am session (so it ends on the failed patch, to allow us to rebuild after fixing it)
-            val apply2 = ProcessBuilder()
-                .directory(projectDir.path)
-                .command("./gradlew", applyTaskName.get())
-                .redirectErrorStream(true)
-                .start()
-
-            val f1 = redirect(apply2.inputStream, System.out)
-            apply2.waitFor()
-            f1.get()
-
-            logger.lifecycle(outStr)
-            logger.lifecycle("Patch failed at $failed; See Git output above.")
-        } else {
-            unapplied.forEach { it.deleteIfExists() }
-            logger.lifecycle("All patches applied!")
-        }
-
-        val git = Git(projectDir.path)
-        git("add", appliedPatches.path.toString() + "/*").runSilently()
-        git("add", unappliedPatches.path.toString() + "/*").runSilently()
-    }
-}
- */

gradle.properties

@@ -1,9 +1,9 @@
 group=io.papermc.paper
-version=1.21.4-R0.1-SNAPSHOT
+version=1.21.5-R0.1-SNAPSHOT
-mcVersion=1.21.4
+mcVersion=1.21.5
 
 # Set to true while updating Minecraft version
-updatingMinecraft=false
+updatingMinecraft=true
 updateTaskListIssue=https://github.com/PaperMC/Paper/issues/11736
 
 org.gradle.configuration-cache=true

paper-api-generator/build.gradle.kts

@@ -1,37 +0,0 @@
-import io.papermc.paperweight.util.defaultJavaLauncher
-
-plugins {
-    java
-    id("io.papermc.paperweight.source-generator")
-}
-
-paperweight {
-    atFile.set(layout.projectDirectory.file("wideners.at"))
-}
-
-dependencies {
-    minecraftJar(project(":paper-server", "mappedJarOutgoing"))
-    implementation(project(":paper-server", "macheMinecraftLibraries"))
-
-    implementation("com.squareup:javapoet:1.13.0")
-    implementation(project(":paper-api"))
-    implementation("io.github.classgraph:classgraph:4.8.47")
-    implementation("org.jetbrains:annotations:26.0.1")
-    testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
-    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
-}
-
-tasks.register<JavaExec>("generate") {
-    dependsOn(tasks.check)
-    mainClass.set("io.papermc.generator.Main")
-    classpath(sourceSets.main.map { it.runtimeClasspath })
-    args(projectDir.toPath().resolve("generated").toString())
-    javaLauncher = javaToolchains.defaultJavaLauncher(project)
-}
-
-tasks.test {
-    useJUnitPlatform()
-}
-
-group = "io.papermc.paper"
-version = "1.0-SNAPSHOT"

paper-api-generator/generated/io/papermc/paper/registry/keys/tags/CatVariantTagKeys.java

@@ -1,57 +0,0 @@
-package io.papermc.paper.registry.keys.tags;
-
-import static net.kyori.adventure.key.Key.key;
-
-import io.papermc.paper.generated.GeneratedFrom;
-import io.papermc.paper.registry.RegistryKey;
-import io.papermc.paper.registry.tag.TagKey;
-import net.kyori.adventure.key.Key;
-import org.bukkit.entity.Cat;
-import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;
-
-/**
- * Vanilla keys for {@link RegistryKey#CAT_VARIANT}.
- *
- * @apiNote The fields provided here are a direct representation of
- * what is available from the vanilla game source. They may be
- * changed (including removals) on any Minecraft version
- * bump, so cross-version compatibility is not provided on the
- * same level as it is on most of the other API.
- */
-@SuppressWarnings({
-        "unused",
-        "SpellCheckingInspection"
-})
-@GeneratedFrom("1.21.4")
-@NullMarked
-@ApiStatus.Experimental
-public final class CatVariantTagKeys {
-    /**
-     * {@code #minecraft:default_spawns}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TagKey<Cat.Type> DEFAULT_SPAWNS = create(key("default_spawns"));
-
-    /**
-     * {@code #minecraft:full_moon_spawns}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TagKey<Cat.Type> FULL_MOON_SPAWNS = create(key("full_moon_spawns"));
-
-    private CatVariantTagKeys() {
-    }
-
-    /**
-     * Creates a tag key for {@link Cat.Type} in the registry {@code minecraft:cat_variant}.
-     *
-     * @param key the tag key's key
-     * @return a new tag key
-     */
-    @ApiStatus.Experimental
-    public static TagKey<Cat.Type> create(final Key key) {
-        return TagKey.create(RegistryKey.CAT_VARIANT, key);
-    }
-}

paper-api-generator/src/main/java/io/papermc/generator/Generators.java

@@ -1,96 +0,0 @@
-package io.papermc.generator;
-
-import io.papermc.generator.types.GeneratedKeyType;
-import io.papermc.generator.types.GeneratedTagKeyType;
-import io.papermc.generator.types.SourceGenerator;
-import io.papermc.generator.types.goal.MobGoalGenerator;
-import io.papermc.paper.registry.RegistryKey;
-import net.minecraft.core.Registry;
-import net.minecraft.core.registries.Registries;
-import net.minecraft.resources.ResourceKey;
-import org.bukkit.Art;
-import org.bukkit.Fluid;
-import org.bukkit.GameEvent;
-import org.bukkit.JukeboxSong;
-import org.bukkit.MusicInstrument;
-import org.bukkit.Sound;
-import org.bukkit.attribute.Attribute;
-import org.bukkit.block.Biome;
-import org.bukkit.block.BlockType;
-import org.bukkit.block.banner.PatternType;
-import org.bukkit.damage.DamageType;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.entity.Cat;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Frog;
-import org.bukkit.entity.Villager;
-import org.bukkit.entity.Wolf;
-import org.bukkit.generator.structure.Structure;
-import org.bukkit.generator.structure.StructureType;
-import org.bukkit.inventory.ItemType;
-import org.bukkit.inventory.MenuType;
-import org.bukkit.inventory.meta.trim.TrimMaterial;
-import org.bukkit.inventory.meta.trim.TrimPattern;
-import org.bukkit.map.MapCursor;
-import org.bukkit.potion.PotionEffectType;
-
-public interface Generators {
-
-    SourceGenerator[] API = {
-        // built-ins
-        simpleKey("GameEventKeys", GameEvent.class, Registries.GAME_EVENT, RegistryKey.GAME_EVENT, true),
-        simpleKey("StructureTypeKeys", StructureType.class, Registries.STRUCTURE_TYPE, RegistryKey.STRUCTURE_TYPE, false),
-        simpleKey("MobEffectKeys", PotionEffectType.class, Registries.MOB_EFFECT, RegistryKey.MOB_EFFECT, false),
-        simpleKey("BlockTypeKeys", BlockType.class, Registries.BLOCK, RegistryKey.BLOCK, false),
-        simpleKey("ItemTypeKeys", ItemType.class, Registries.ITEM, RegistryKey.ITEM, false),
-        simpleKey("CatVariantKeys", Cat.Type.class, Registries.CAT_VARIANT, RegistryKey.CAT_VARIANT, false),
-        simpleKey("FrogVariantKeys", Frog.Variant.class, Registries.FROG_VARIANT, RegistryKey.FROG_VARIANT, false),
-        simpleKey("VillagerProfessionKeys", Villager.Profession.class, Registries.VILLAGER_PROFESSION, RegistryKey.VILLAGER_PROFESSION, false),
-        simpleKey("VillagerTypeKeys", Villager.Type.class, Registries.VILLAGER_TYPE, RegistryKey.VILLAGER_TYPE, false),
-        simpleKey("MapDecorationTypeKeys", MapCursor.Type.class, Registries.MAP_DECORATION_TYPE, RegistryKey.MAP_DECORATION_TYPE, false),
-        simpleKey("MenuTypeKeys", MenuType.class, Registries.MENU, RegistryKey.MENU, false),
-        simpleKey("AttributeKeys", Attribute.class, Registries.ATTRIBUTE, RegistryKey.ATTRIBUTE, false),
-        simpleKey("FluidKeys", Fluid.class, Registries.FLUID, RegistryKey.FLUID, false),
-        simpleKey("SoundEventKeys", Sound.class, Registries.SOUND_EVENT, RegistryKey.SOUND_EVENT, false),
-
-        // data-driven
-        simpleKey("BiomeKeys", Biome.class, Registries.BIOME, RegistryKey.BIOME, true),
-        simpleKey("StructureKeys", Structure.class, Registries.STRUCTURE, RegistryKey.STRUCTURE, true),
-        simpleKey("TrimMaterialKeys", TrimMaterial.class, Registries.TRIM_MATERIAL, RegistryKey.TRIM_MATERIAL, true),
-        simpleKey("TrimPatternKeys", TrimPattern.class, Registries.TRIM_PATTERN, RegistryKey.TRIM_PATTERN, true),
-        simpleKey("DamageTypeKeys", DamageType.class, Registries.DAMAGE_TYPE, RegistryKey.DAMAGE_TYPE, true),
-        simpleKey("WolfVariantKeys", Wolf.Variant.class, Registries.WOLF_VARIANT, RegistryKey.WOLF_VARIANT, true),
-        simpleKey("EnchantmentKeys", Enchantment.class, Registries.ENCHANTMENT, RegistryKey.ENCHANTMENT, true),
-        simpleKey("JukeboxSongKeys", JukeboxSong.class, Registries.JUKEBOX_SONG, RegistryKey.JUKEBOX_SONG, true),
-        simpleKey("BannerPatternKeys", PatternType.class, Registries.BANNER_PATTERN, RegistryKey.BANNER_PATTERN, true),
-        simpleKey("PaintingVariantKeys", Art.class, Registries.PAINTING_VARIANT, RegistryKey.PAINTING_VARIANT, true),
-        simpleKey("InstrumentKeys", MusicInstrument.class, Registries.INSTRUMENT, RegistryKey.INSTRUMENT, true),
-
-        // tags
-        simpleTagKey("GameEventTagKeys", GameEvent.class, Registries.GAME_EVENT, RegistryKey.GAME_EVENT),
-        simpleTagKey("BlockTypeTagKeys", BlockType.class, Registries.BLOCK, RegistryKey.BLOCK),
-        simpleTagKey("ItemTypeTagKeys", ItemType.class, Registries.ITEM, RegistryKey.ITEM),
-        simpleTagKey("CatVariantTagKeys", Cat.Type.class, Registries.CAT_VARIANT, RegistryKey.CAT_VARIANT),
-        simpleTagKey("FluidTagKeys", Fluid.class, Registries.FLUID, RegistryKey.FLUID),
-
-        simpleTagKey("BiomeTagKeys", Biome.class, Registries.BIOME, RegistryKey.BIOME),
-        simpleTagKey("StructureTagKeys", Structure.class, Registries.STRUCTURE, RegistryKey.STRUCTURE),
-        simpleTagKey("DamageTypeTagKeys", DamageType.class, Registries.DAMAGE_TYPE, RegistryKey.DAMAGE_TYPE),
-        simpleTagKey("EnchantmentTagKeys", Enchantment.class, Registries.ENCHANTMENT, RegistryKey.ENCHANTMENT),
-        simpleTagKey("BannerPatternTagKeys", PatternType.class, Registries.BANNER_PATTERN, RegistryKey.BANNER_PATTERN),
-        simpleTagKey("PaintingVariantTagKeys", Art.class, Registries.PAINTING_VARIANT, RegistryKey.PAINTING_VARIANT),
-        simpleTagKey("InstrumentTagKeys", MusicInstrument.class, Registries.INSTRUMENT, RegistryKey.INSTRUMENT),
-
-        // api only
-        simpleTagKey("EntityTypeTagKeys", EntityType.class, Registries.ENTITY_TYPE, RegistryKey.ENTITY_TYPE),
-        new MobGoalGenerator("VanillaGoal", "com.destroystokyo.paper.entity.ai")
-    };
-
-    private static <T, A> SourceGenerator simpleKey(final String className, final Class<A> apiType, final ResourceKey<? extends Registry<T>> registryKey, final RegistryKey<A> apiRegistryKey, final boolean publicCreateKeyMethod) {
-        return new GeneratedKeyType<>(className, apiType, "io.papermc.paper.registry.keys", registryKey, apiRegistryKey, publicCreateKeyMethod);
-    }
-
-    private static <T, A> SourceGenerator simpleTagKey(final String className, final Class<A> apiType, final ResourceKey<? extends Registry<T>> registryKey, final RegistryKey<A> apiRegistryKey) {
-        return new GeneratedTagKeyType<>(className, apiType, "io.papermc.paper.registry.keys.tags", registryKey, apiRegistryKey, true);
-    }
-}

paper-api-generator/src/main/java/io/papermc/generator/Main.java

@@ -1,93 +0,0 @@
-package io.papermc.generator;
-
-import com.google.common.util.concurrent.MoreExecutors;
-import com.mojang.logging.LogUtils;
-import io.papermc.generator.types.SourceGenerator;
-import io.papermc.generator.utils.TagCollector;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.List;
-import java.util.Map;
-import net.minecraft.SharedConstants;
-import net.minecraft.commands.Commands;
-import net.minecraft.core.HolderLookup;
-import net.minecraft.core.LayeredRegistryAccess;
-import net.minecraft.core.Registry;
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.resources.RegistryDataLoader;
-import net.minecraft.server.Bootstrap;
-import net.minecraft.server.RegistryLayer;
-import net.minecraft.server.ReloadableServerResources;
-import net.minecraft.server.packs.PackType;
-import net.minecraft.server.packs.repository.Pack;
-import net.minecraft.server.packs.repository.PackRepository;
-import net.minecraft.server.packs.repository.ServerPacksSource;
-import net.minecraft.server.packs.resources.MultiPackResourceManager;
-import net.minecraft.tags.TagKey;
-import net.minecraft.tags.TagLoader;
-import net.minecraft.world.flag.FeatureFlags;
-import org.apache.commons.io.file.PathUtils;
-import org.slf4j.Logger;
-
-public final class Main {
-
-    private static final Logger LOGGER = LogUtils.getLogger();
-    public static final RegistryAccess.Frozen REGISTRY_ACCESS;
-    public static final Map<TagKey<?>, String> EXPERIMENTAL_TAGS;
-
-    static {
-        SharedConstants.tryDetectVersion();
-        Bootstrap.bootStrap();
-        Bootstrap.validate();
-
-        final PackRepository resourceRepository = ServerPacksSource.createVanillaTrustedRepository();
-        resourceRepository.reload();
-        final MultiPackResourceManager resourceManager = new MultiPackResourceManager(PackType.SERVER_DATA, resourceRepository.getAvailablePacks().stream().map(Pack::open).toList());
-        LayeredRegistryAccess<RegistryLayer> layers = RegistryLayer.createRegistryAccess();
-        final List<Registry.PendingTags<?>> pendingTags = TagLoader.loadTagsForExistingRegistries(resourceManager, layers.getLayer(RegistryLayer.STATIC));
-        final List<HolderLookup.RegistryLookup<?>> worldGenLayer = TagLoader.buildUpdatedLookups(layers.getAccessForLoading(RegistryLayer.WORLDGEN), pendingTags);
-        final RegistryAccess.Frozen frozenWorldgenRegistries = RegistryDataLoader.load(resourceManager, worldGenLayer, RegistryDataLoader.WORLDGEN_REGISTRIES);
-        layers = layers.replaceFrom(RegistryLayer.WORLDGEN, frozenWorldgenRegistries);
-        REGISTRY_ACCESS = layers.compositeAccess().freeze();
-        final ReloadableServerResources reloadableServerResources = ReloadableServerResources.loadResources(
-            resourceManager,
-            layers,
-            pendingTags,
-            FeatureFlags.VANILLA_SET,
-            Commands.CommandSelection.DEDICATED,
-            0,
-            MoreExecutors.directExecutor(),
-            MoreExecutors.directExecutor()
-        ).join();
-        reloadableServerResources.updateStaticRegistryTags();
-        EXPERIMENTAL_TAGS = TagCollector.grabExperimental(resourceManager);
-    }
-
-    private Main() {
-    }
-
-    public static void main(final String[] args) {
-        LOGGER.info("Running API generators...");
-        generate(Paths.get(args[0]), Generators.API);
-        // LOGGER.info("Running Server generators...");
-        // generate(Paths.get(args[1]), Generators.SERVER);
-    }
-
-    private static void generate(Path output, SourceGenerator[] generators) {
-        try {
-            if (Files.exists(output)) {
-                PathUtils.deleteDirectory(output);
-            }
-            Files.createDirectories(output);
-
-            for (final SourceGenerator generator : generators) {
-                generator.writeToFile(output);
-            }
-
-            LOGGER.info("Files written to {}", output.toAbsolutePath());
-        } catch (final Exception ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-}

paper-api-generator/src/main/java/io/papermc/generator/types/GeneratedKeyType.java

@@ -1,207 +0,0 @@
-package io.papermc.generator.types;
-
-import com.google.common.collect.Sets;
-import com.squareup.javapoet.FieldSpec;
-import com.squareup.javapoet.JavaFile;
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.ParameterSpec;
-import com.squareup.javapoet.ParameterizedTypeName;
-import com.squareup.javapoet.TypeName;
-import com.squareup.javapoet.TypeSpec;
-import io.papermc.generator.Main;
-import io.papermc.generator.utils.Annotations;
-import io.papermc.generator.utils.CollectingContext;
-import io.papermc.generator.utils.Formatting;
-import io.papermc.generator.utils.Javadocs;
-import io.papermc.paper.registry.RegistryKey;
-import io.papermc.paper.registry.TypedKey;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.IdentityHashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-import javax.lang.model.SourceVersion;
-import net.kyori.adventure.key.Key;
-import net.minecraft.core.Holder;
-import net.minecraft.core.HolderLookup;
-import net.minecraft.core.Registry;
-import net.minecraft.core.RegistrySetBuilder;
-import net.minecraft.core.registries.Registries;
-import net.minecraft.data.registries.VanillaRegistries;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.world.flag.FeatureElement;
-import net.minecraft.world.flag.FeatureFlags;
-import org.bukkit.MinecraftExperimental;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-import org.checkerframework.framework.qual.DefaultQualifier;
-
-import static com.squareup.javapoet.TypeSpec.classBuilder;
-import static io.papermc.generator.utils.Annotations.EXPERIMENTAL_API_ANNOTATION;
-import static io.papermc.generator.utils.Annotations.experimentalAnnotations;
-import static java.util.Objects.requireNonNull;
-import static javax.lang.model.element.Modifier.FINAL;
-import static javax.lang.model.element.Modifier.PRIVATE;
-import static javax.lang.model.element.Modifier.PUBLIC;
-import static javax.lang.model.element.Modifier.STATIC;
-
-@DefaultQualifier(NonNull.class)
-public class GeneratedKeyType<T, A> extends SimpleGenerator {
-
-    private static final Map<ResourceKey<? extends Registry<?>>, RegistrySetBuilder.RegistryBootstrap<?>> VANILLA_REGISTRY_ENTRIES = VanillaRegistries.BUILDER.entries.stream()
-            .collect(Collectors.toMap(RegistrySetBuilder.RegistryStub::key, RegistrySetBuilder.RegistryStub::bootstrap));
-
-    private static final Map<ResourceKey<? extends Registry<?>>, RegistrySetBuilder.RegistryBootstrap<?>> EXPERIMENTAL_REGISTRY_ENTRIES = Map.of(); // Update for Experimental API
-    private static final Map<RegistryKey<?>, String> REGISTRY_KEY_FIELD_NAMES;
-    static {
-        final Map<RegistryKey<?>, String> map = new HashMap<>();
-        try {
-            for (final Field field : RegistryKey.class.getFields()) {
-                if (!Modifier.isStatic(field.getModifiers()) || !Modifier.isFinal(field.getModifiers()) || field.getType() != RegistryKey.class) {
-                    continue;
-                }
-                map.put((RegistryKey<?>) field.get(null), field.getName());
-            }
-            REGISTRY_KEY_FIELD_NAMES = Map.copyOf(map);
-        } catch (final ReflectiveOperationException ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-
-    private static final String CREATE_JAVADOC = """
-        Creates a key for {@link $T} in the registry {@code $L}.
-        
-        @param key the value's key in the registry
-        @return a new typed key
-        """;
-
-    private final Class<A> apiType;
-    private final ResourceKey<? extends Registry<T>> registryKey;
-    private final RegistryKey<A> apiRegistryKey;
-    private final boolean publicCreateKeyMethod;
-
-    public GeneratedKeyType(final String keysClassName, final Class<A> apiType, final String pkg, final ResourceKey<? extends Registry<T>> registryKey, final RegistryKey<A> apiRegistryKey, final boolean publicCreateKeyMethod) {
-        super(keysClassName, pkg);
-        this.apiType = apiType;
-        this.registryKey = registryKey;
-        this.apiRegistryKey = apiRegistryKey;
-        this.publicCreateKeyMethod = publicCreateKeyMethod;
-    }
-
-    private MethodSpec.Builder createMethod(final TypeName returnType) {
-        final TypeName keyType = TypeName.get(Key.class);
-
-        final ParameterSpec keyParam = ParameterSpec.builder(keyType, "key", FINAL).build();
-        final MethodSpec.Builder create = MethodSpec.methodBuilder("create")
-            .addModifiers(this.publicCreateKeyMethod ? PUBLIC : PRIVATE, STATIC)
-            .addParameter(keyParam)
-            .addCode("return $T.create($T.$L, $N);", TypedKey.class, RegistryKey.class, requireNonNull(REGISTRY_KEY_FIELD_NAMES.get(this.apiRegistryKey), "Missing field for " + this.apiRegistryKey), keyParam)
-            .returns(returnType);
-        if (this.publicCreateKeyMethod) {
-            create.addAnnotation(EXPERIMENTAL_API_ANNOTATION); // TODO remove once not experimental
-            create.addJavadoc(CREATE_JAVADOC, this.apiType, this.registryKey.location().toString());
-        }
-        return create;
-    }
-
-    private TypeSpec.Builder keyHolderType() {
-        return classBuilder(this.className)
-            .addModifiers(PUBLIC, FINAL)
-            .addJavadoc(Javadocs.getVersionDependentClassHeader("{@link $T#$L}"), RegistryKey.class, REGISTRY_KEY_FIELD_NAMES.get(this.apiRegistryKey))
-            .addAnnotations(Annotations.CLASS_HEADER)
-            .addMethod(MethodSpec.constructorBuilder()
-                .addModifiers(PRIVATE)
-                .build()
-            );
-    }
-
-    @Deprecated
-    private static final Map<String, String> JUKEBOX_SONG_NAMES = Map.of(
-        "5", "FIVE",
-        "11", "ELEVEN",
-        "13", "THIRTEEN"
-    );
-
-    @Override
-    protected TypeSpec getTypeSpec() {
-        final TypeName typedKey = ParameterizedTypeName.get(TypedKey.class, this.apiType);
-
-        final TypeSpec.Builder typeBuilder = this.keyHolderType();
-        final MethodSpec.Builder createMethod = this.createMethod(typedKey);
-
-        final Registry<T> registry = Main.REGISTRY_ACCESS.lookupOrThrow(this.registryKey);
-        final Set<ResourceKey<T>> experimental = this.collectExperimentalKeys(registry);
-
-        boolean allExperimental = true;
-        for (final Holder.Reference<T> reference : registry.listElements().sorted(Formatting.alphabeticKeyOrder(reference -> reference.key().location().getPath())).toList()) {
-            final ResourceKey<T> key = reference.key();
-            final String keyPath = key.location().getPath();
-            String fieldName = Formatting.formatKeyAsField(keyPath);
-            if (!SourceVersion.isIdentifier(fieldName) && this.registryKey.equals(Registries.JUKEBOX_SONG) && JUKEBOX_SONG_NAMES.containsKey(fieldName)) {
-                fieldName = JUKEBOX_SONG_NAMES.get(fieldName);
-            }
-
-            final FieldSpec.Builder fieldBuilder = FieldSpec.builder(typedKey, fieldName, PUBLIC, STATIC, FINAL)
-                .initializer("$N(key($S))", createMethod.build(), keyPath)
-                .addJavadoc(Javadocs.getVersionDependentField("{@code $L}"), key.location().toString());
-            if (experimental.contains(key)) {
-                fieldBuilder.addAnnotations(experimentalAnnotations(null)); // Update for Experimental API
-            } else {
-                allExperimental = false;
-            }
-            typeBuilder.addField(fieldBuilder.build());
-        }
-        if (allExperimental) {
-            typeBuilder.addAnnotations(experimentalAnnotations(null)); // Update for Experimental API
-            createMethod.addAnnotations(experimentalAnnotations(null)); // Update for Experimental API
-        } else {
-            typeBuilder.addAnnotation(EXPERIMENTAL_API_ANNOTATION); // TODO experimental API
-        }
-        return typeBuilder.addMethod(createMethod.build()).build();
-    }
-
-    // todo at some point this should be per feature data pack not all merged
-    private Set<ResourceKey<T>> collectExperimentalKeys(final Registry<T> registry) {
-        if (FeatureElement.FILTERED_REGISTRIES.contains(registry.key())) {
-            return this.collectExperimentalKeysBuiltIn(registry);
-        } else {
-            return this.collectExperimentalKeysDataDriven(registry);
-        }
-    }
-
-    private Set<ResourceKey<T>> collectExperimentalKeysBuiltIn(final Registry<T> registry) {
-        final HolderLookup.RegistryLookup<T> filteredLookup = registry.filterElements(v -> {
-            return v instanceof final FeatureElement featureElement && FeatureFlags.isExperimental(featureElement.requiredFeatures()); // Update for Experimental API
-        });
-        return filteredLookup.listElementIds().collect(Collectors.toUnmodifiableSet());
-    }
-
-    @SuppressWarnings("unchecked")
-    private Set<ResourceKey<T>> collectExperimentalKeysDataDriven(final Registry<T> registry) {
-        final RegistrySetBuilder.@Nullable RegistryBootstrap<T> experimentalBootstrap = (RegistrySetBuilder.RegistryBootstrap<T>) EXPERIMENTAL_REGISTRY_ENTRIES.get(this.registryKey);
-        if (experimentalBootstrap == null) {
-            return Collections.emptySet();
-        }
-        final Set<ResourceKey<T>> experimental = Collections.newSetFromMap(new IdentityHashMap<>());
-        final CollectingContext<T> experimentalCollector = new CollectingContext<>(experimental, registry);
-        experimentalBootstrap.run(experimentalCollector);
-
-        final RegistrySetBuilder.@Nullable RegistryBootstrap<T> vanillaBootstrap = (RegistrySetBuilder.RegistryBootstrap<T>) VANILLA_REGISTRY_ENTRIES.get(this.registryKey);
-        if (vanillaBootstrap != null) {
-            final Set<ResourceKey<T>> vanilla = Collections.newSetFromMap(new IdentityHashMap<>());
-            final CollectingContext<T> vanillaCollector = new CollectingContext<>(vanilla, registry);
-            vanillaBootstrap.run(vanillaCollector);
-            return Sets.difference(experimental, vanilla);
-        }
-        return experimental;
-    }
-
-    @Override
-    protected JavaFile.Builder file(final JavaFile.Builder builder) {
-        return builder
-            .addStaticImport(Key.class, "key");
-    }
-}

paper-api-generator/src/main/java/io/papermc/generator/types/GeneratedTagKeyType.java

@@ -1,138 +0,0 @@
-package io.papermc.generator.types;
-
-import com.squareup.javapoet.FieldSpec;
-import com.squareup.javapoet.JavaFile;
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.ParameterSpec;
-import com.squareup.javapoet.ParameterizedTypeName;
-import com.squareup.javapoet.TypeName;
-import com.squareup.javapoet.TypeSpec;
-import io.papermc.generator.Main;
-import io.papermc.generator.utils.Annotations;
-import io.papermc.generator.utils.Formatting;
-import io.papermc.generator.utils.Javadocs;
-import io.papermc.paper.registry.RegistryKey;
-import io.papermc.paper.registry.tag.TagKey;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
-import net.kyori.adventure.key.Key;
-import net.minecraft.core.Registry;
-import net.minecraft.resources.ResourceKey;
-import org.bukkit.MinecraftExperimental;
-
-import static com.squareup.javapoet.TypeSpec.classBuilder;
-import static io.papermc.generator.utils.Annotations.EXPERIMENTAL_API_ANNOTATION;
-import static io.papermc.generator.utils.Annotations.experimentalAnnotations;
-import static java.util.Objects.requireNonNull;
-import static javax.lang.model.element.Modifier.FINAL;
-import static javax.lang.model.element.Modifier.PRIVATE;
-import static javax.lang.model.element.Modifier.PUBLIC;
-import static javax.lang.model.element.Modifier.STATIC;
-
-public class GeneratedTagKeyType<T, A> extends SimpleGenerator {
-
-    private static final Map<RegistryKey<?>, String> REGISTRY_KEY_FIELD_NAMES;
-    static {
-        final Map<RegistryKey<?>, String> map = new HashMap<>();
-        try {
-            for (final Field field : RegistryKey.class.getFields()) {
-                if (!Modifier.isStatic(field.getModifiers()) || !Modifier.isFinal(field.getModifiers()) || field.getType() != RegistryKey.class) {
-                    continue;
-                }
-                map.put((RegistryKey<?>) field.get(null), field.getName());
-            }
-            REGISTRY_KEY_FIELD_NAMES = Map.copyOf(map);
-        } catch (final ReflectiveOperationException ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-
-    private static final String CREATE_JAVADOC = """
-        Creates a tag key for {@link $T} in the registry {@code $L}.
-        
-        @param key the tag key's key
-        @return a new tag key
-        """;
-
-    private final Class<A> apiType;
-    private final ResourceKey<? extends Registry<T>> registryKey;
-    private final RegistryKey<A> apiRegistryKey;
-    private final boolean publicCreateKeyMethod;
-
-    public GeneratedTagKeyType(final String keysClassName, final Class<A> apiType, final String pkg, final ResourceKey<? extends Registry<T>> registryKey, final RegistryKey<A> apiRegistryKey, final boolean publicCreateKeyMethod) {
-        super(keysClassName, pkg);
-        this.apiType = apiType;
-        this.registryKey = registryKey;
-        this.apiRegistryKey = apiRegistryKey;
-        this.publicCreateKeyMethod = publicCreateKeyMethod;
-    }
-
-    private MethodSpec.Builder createMethod(final TypeName returnType) {
-        final TypeName keyType = TypeName.get(Key.class);
-
-        final ParameterSpec keyParam = ParameterSpec.builder(keyType, "key", FINAL).build();
-        final MethodSpec.Builder create = MethodSpec.methodBuilder("create")
-            .addModifiers(this.publicCreateKeyMethod ? PUBLIC : PRIVATE, STATIC)
-            .addParameter(keyParam)
-            .addCode("return $T.create($T.$L, $N);", TagKey.class, RegistryKey.class, requireNonNull(REGISTRY_KEY_FIELD_NAMES.get(this.apiRegistryKey), "Missing field for " + this.apiRegistryKey), keyParam)
-            .returns(returnType);
-        if (this.publicCreateKeyMethod) {
-            create.addAnnotation(EXPERIMENTAL_API_ANNOTATION); // TODO remove once not experimental
-            create.addJavadoc(CREATE_JAVADOC, this.apiType, this.registryKey.location().toString());
-        }
-        return create;
-    }
-
-    private TypeSpec.Builder keyHolderType() {
-        return classBuilder(this.className)
-            .addModifiers(PUBLIC, FINAL)
-            .addJavadoc(Javadocs.getVersionDependentClassHeader("{@link $T#$L}"), RegistryKey.class, REGISTRY_KEY_FIELD_NAMES.get(this.apiRegistryKey))
-            .addAnnotations(Annotations.CLASS_HEADER)
-            .addMethod(MethodSpec.constructorBuilder()
-                .addModifiers(PRIVATE)
-                .build()
-            );
-    }
-
-    @Override
-    protected TypeSpec getTypeSpec() {
-        final TypeName tagKey = ParameterizedTypeName.get(TagKey.class, this.apiType);
-
-        final TypeSpec.Builder typeBuilder = this.keyHolderType();
-        final MethodSpec.Builder createMethod = this.createMethod(tagKey);
-
-        final Registry<T> registry = Main.REGISTRY_ACCESS.lookupOrThrow(this.registryKey);
-
-        final AtomicBoolean allExperimental = new AtomicBoolean(true);
-        registry.listTagIds().sorted(Formatting.alphabeticKeyOrder(nmsTagKey -> nmsTagKey.location().getPath())).forEach(nmsTagKey -> {
-            final String fieldName = Formatting.formatKeyAsField(nmsTagKey.location().getPath());
-            final FieldSpec.Builder fieldBuilder = FieldSpec.builder(tagKey, fieldName, PUBLIC, STATIC, FINAL)
-                .initializer("$N(key($S))", createMethod.build(), nmsTagKey.location().getPath())
-                .addJavadoc(Javadocs.getVersionDependentField("{@code $L}"), "#" + nmsTagKey.location());
-            final String featureFlagName = Main.EXPERIMENTAL_TAGS.get(nmsTagKey);
-            if (featureFlagName != null) {
-                fieldBuilder.addAnnotations(experimentalAnnotations(MinecraftExperimental.Requires.valueOf(featureFlagName.toUpperCase(Locale.ENGLISH)))); // Update for Experimental API
-            } else {
-                allExperimental.set(false);
-            }
-            typeBuilder.addField(fieldBuilder.build());
-        });
-        if (allExperimental.get()) {
-            typeBuilder.addAnnotations(experimentalAnnotations(null)); // Update for Experimental API
-            createMethod.addAnnotations(experimentalAnnotations(null)); // Update for Experimental API
-        } else {
-            typeBuilder.addAnnotation(EXPERIMENTAL_API_ANNOTATION); // TODO experimental API
-        }
-        return typeBuilder.addMethod(createMethod.build()).build();
-    }
-
-    @Override
-    protected JavaFile.Builder file(final JavaFile.Builder builder) {
-        return builder
-            .addStaticImport(Key.class, "key");
-    }
-}

paper-api-generator/src/main/java/io/papermc/generator/utils/Annotations.java

@@ -1,65 +0,0 @@
-package io.papermc.generator.utils;
-
-import com.squareup.javapoet.AnnotationSpec;
-import java.util.ArrayList;
-import java.util.List;
-
-import io.papermc.paper.generated.GeneratedFrom;
-import net.minecraft.SharedConstants;
-import org.bukkit.MinecraftExperimental;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.Nullable;
-import org.jspecify.annotations.NullMarked;
-
-public final class Annotations {
-
-    public static List<AnnotationSpec> experimentalAnnotations(final MinecraftExperimental.@Nullable Requires requiredFeatureFlag) {
-        final List<AnnotationSpec> annotationSpecs = new ArrayList<>();
-        annotationSpecs.add(AnnotationSpec.builder(ApiStatus.Experimental.class).build());
-        if (requiredFeatureFlag != null) {
-            annotationSpecs.add(AnnotationSpec.builder(MinecraftExperimental.class)
-                .addMember("value", "$T.$L", MinecraftExperimental.Requires.class, requiredFeatureFlag.name())
-                .build());
-        } else {
-            annotationSpecs.add(AnnotationSpec.builder(MinecraftExperimental.class).build());
-        }
-        return annotationSpecs;
-    }
-
-    public static AnnotationSpec deprecatedVersioned(final @Nullable String version, final boolean forRemoval) {
-        final AnnotationSpec.Builder annotationSpec = AnnotationSpec.builder(Deprecated.class);
-        if (forRemoval) {
-            annotationSpec.addMember("forRemoval", "$L", true);
-        }
-        if (version != null) {
-            annotationSpec.addMember("since", "$S", version);
-        }
-
-        return annotationSpec.build();
-    }
-
-    public static AnnotationSpec scheduledRemoval(final @Nullable String version) {
-        return AnnotationSpec.builder(ApiStatus.ScheduledForRemoval.class)
-            .addMember("inVersion", "$S", version)
-            .build();
-    }
-
-    @ApiStatus.Experimental
-    public static final AnnotationSpec EXPERIMENTAL_API_ANNOTATION = AnnotationSpec.builder(ApiStatus.Experimental.class).build();
-    public static final AnnotationSpec NULL_MARKED = AnnotationSpec.builder(NullMarked.class).build();
-    private static final AnnotationSpec SUPPRESS_WARNINGS = AnnotationSpec.builder(SuppressWarnings.class)
-        .addMember("value", "$S", "unused")
-        .addMember("value", "$S", "SpellCheckingInspection")
-        .build();
-    private static final AnnotationSpec GENERATED_FROM = AnnotationSpec.builder(GeneratedFrom.class)
-        .addMember("value", "$S", SharedConstants.getCurrentVersion().getName())
-        .build();
-    public static final Iterable<AnnotationSpec> CLASS_HEADER = List.of(
-        SUPPRESS_WARNINGS,
-        GENERATED_FROM,
-        NULL_MARKED
-    );
-
-    private Annotations() {
-    }
-}

paper-api-generator/src/main/java/io/papermc/generator/utils/Javadocs.java

@@ -1,27 +0,0 @@
-package io.papermc.generator.utils;
-
-public final class Javadocs {
-
-    public static String getVersionDependentClassHeader(String headerIdentifier) {
-        return """
-        Vanilla keys for %s.
-        
-        @apiNote The fields provided here are a direct representation of
-        what is available from the vanilla game source. They may be
-        changed (including removals) on any Minecraft version
-        bump, so cross-version compatibility is not provided on the
-        same level as it is on most of the other API.
-        """.formatted(headerIdentifier);
-    }
-
-    public static String getVersionDependentField(String headerIdentifier) {
-        return """
-        %s
-        
-        @apiNote This field is version-dependant and may be removed in future Minecraft versions
-        """.formatted(headerIdentifier);
-    }
-
-    private Javadocs() {
-    }
-}

paper-api-generator/src/main/java/io/papermc/generator/utils/TagCollector.java

@@ -1,79 +0,0 @@
-package io.papermc.generator.utils;
-
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
-import com.mojang.logging.LogUtils;
-import io.papermc.generator.Main;
-import java.util.Collections;
-import java.util.IdentityHashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.BiConsumer;
-import net.minecraft.core.Registry;
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.core.registries.Registries;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.server.packs.PackResources;
-import net.minecraft.server.packs.PackType;
-import net.minecraft.server.packs.repository.BuiltInPackSource;
-import net.minecraft.server.packs.resources.MultiPackResourceManager;
-import net.minecraft.tags.TagKey;
-import org.slf4j.Logger;
-
-// collect all the tags by grabbing the json from the data-packs
-// another (probably) way is to hook into the data generator like the typed keys generator
-public final class TagCollector {
-
-    private static final Logger LOGGER = LogUtils.getLogger();
-
-    public static Map<TagKey<?>, String> grabExperimental(final MultiPackResourceManager resourceManager) {
-        Map<TagKey<?>, String> result = new IdentityHashMap<>();
-
-        // collect all vanilla tags
-        Multimap<ResourceKey<? extends Registry<?>>, String> vanillaTags = HashMultimap.create();
-        PackResources vanillaPack = resourceManager.listPacks()
-            .filter(packResources -> packResources.packId().equals(BuiltInPackSource.VANILLA_ID))
-            .findFirst()
-            .orElseThrow();
-        collectFromPack(vanillaPack, (entry, path) -> vanillaTags.put(entry.key(), path));
-
-        // then distinct with other data-pack tags to know for sure newly created tags and so experimental one
-        resourceManager.listPacks().forEach(pack -> {
-            String packId = pack.packId();
-            if (packId.equals(BuiltInPackSource.VANILLA_ID)) return;
-
-            collectFromPack(pack, (entry, path) -> {
-                if (vanillaTags.get(entry.key()).contains(path)) {
-                    return;
-                }
-
-                result.put(entry.value().listTagIds()
-                    .filter(tagKey -> tagKey.location().getPath().equals(path))
-                    .findFirst()
-                    .orElseThrow(), packId);
-            });
-        });
-        return Collections.unmodifiableMap(result);
-    }
-
-    private static void collectFromPack(PackResources pack, BiConsumer<RegistryAccess.RegistryEntry<?>, String> output) {
-        Set<String> namespaces = pack.getNamespaces(PackType.SERVER_DATA);
-
-        for (String namespace : namespaces) {
-            Main.REGISTRY_ACCESS.registries().forEach(entry -> {
-                // this is probably expensive but can't find another way around and data-pack loader has similar logic
-                // the issue is that registry key can have parent/key (and custom folder too) but tag key can also have parent/key so parsing become a mess
-                // without having at least one of the two values
-                String tagDir = Registries.tagsDirPath(entry.key());
-                pack.listResources(PackType.SERVER_DATA, namespace, tagDir, (id, supplier) -> {
-                    Formatting.formatTagKey(tagDir, id.getPath()).ifPresentOrElse(path -> output.accept(entry, path), () -> {
-                        LOGGER.warn("Unable to parse the path: {}/{}/{}.json in the data-pack {} into a tag key", namespace, tagDir, id.getPath(), pack.packId());
-                    });
-                });
-            });
-        }
-    }
-
-    private TagCollector() {
-    }
-}

paper-api/build.gradle.kts

@@ -9,11 +9,13 @@ java {
     withJavadocJar()
 }
 
-val annotationsVersion = "26.0.1"
+val annotationsVersion = "26.0.2"
-val bungeeCordChatVersion = "1.20-R0.2"
+// Keep in sync with paper-server adventure-text-serializer-ansi dep
-val adventureVersion = "4.18.0"
+val adventureVersion = "4.21.0-mc1215-SNAPSHOT" // FIXME move to release asap
-val slf4jVersion = "2.0.9"
+val adventureJavadocVersion = "4.20.0" // Fixme remove me
-val log4jVersion = "2.17.1"
+val bungeeCordChatVersion = "1.21-R0.2-deprecated+build.21"
+val slf4jVersion = "2.0.16"
+val log4jVersion = "2.24.1"
 
 val apiAndDocs: Configuration by configurations.creating {
     attributes {
@@ -39,7 +41,6 @@ abstract class MockitoAgentProvider : CommandLineArgumentProvider {
 }
 
 dependencies {
-
     // api dependencies are listed transitively to API consumers
     api("com.google.guava:guava:33.3.1-jre")
     api("com.google.code.gson:gson:2.11.0")
@@ -47,26 +48,25 @@ dependencies {
     api("org.joml:joml:1.10.8") {
         isTransitive = false // https://github.com/JOML-CI/JOML/issues/352
     }
-    api("com.googlecode.json-simple:json-simple:1.1.1") {
-        isTransitive = false // includes junit
-    }
     api("it.unimi.dsi:fastutil:8.5.15")
     api("org.apache.logging.log4j:log4j-api:$log4jVersion")
     api("org.slf4j:slf4j-api:$slf4jVersion")
     api("com.mojang:brigadier:1.3.10")
 
     // Deprecate bungeecord-chat in favor of adventure
-    api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.19") {
+    api("net.md-5:bungeecord-chat:$bungeeCordChatVersion") {
         exclude("com.google.guava", "guava")
     }
 
-    apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion"))
+    // FIXME remove me when we are using a release again
-    apiAndDocs("net.kyori:adventure-api")
+    val adventureGroup = "io.papermc.adventure"
-    apiAndDocs("net.kyori:adventure-text-minimessage")
+    apiAndDocs(platform("$adventureGroup:adventure-bom:$adventureVersion"))
-    apiAndDocs("net.kyori:adventure-text-serializer-gson")
+    apiAndDocs("$adventureGroup:adventure-api")
-    apiAndDocs("net.kyori:adventure-text-serializer-legacy")
+    apiAndDocs("$adventureGroup:adventure-text-minimessage")
-    apiAndDocs("net.kyori:adventure-text-serializer-plain")
+    apiAndDocs("$adventureGroup:adventure-text-serializer-gson")
-    apiAndDocs("net.kyori:adventure-text-logger-slf4j")
+    apiAndDocs("$adventureGroup:adventure-text-serializer-legacy")
+    apiAndDocs("$adventureGroup:adventure-text-serializer-plain")
+    apiAndDocs("$adventureGroup:adventure-text-logger-slf4j")
 
     api("org.apache.maven:maven-resolver-provider:3.9.6") // make API dependency for Paper Plugins
     compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
@@ -77,32 +77,32 @@ dependencies {
     compileOnly(annotations)
     testCompileOnly(annotations)
 
-    val checkerQual = "org.checkerframework:checker-qual:3.33.0"
+    val checkerQual = "org.checkerframework:checker-qual:3.49.2"
     compileOnlyApi(checkerQual)
     testCompileOnly(checkerQual)
 
     api("org.jspecify:jspecify:1.0.0")
 
     // Test dependencies
-    testImplementation("org.apache.commons:commons-lang3:3.12.0")
+    testImplementation("org.apache.commons:commons-lang3:3.17.0")
-    testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
+    testImplementation("org.junit.jupiter:junit-jupiter:5.12.2")
     testImplementation("org.hamcrest:hamcrest:2.2")
     testImplementation("org.mockito:mockito-core:5.14.1")
-    testImplementation("org.ow2.asm:asm-tree:9.7.1")
+    testImplementation("org.ow2.asm:asm-tree:9.8")
     mockitoAgent("org.mockito:mockito-core:5.14.1") { isTransitive = false } // configure mockito agent that is needed in newer java versions
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
-val generatedApiPath: java.nio.file.Path = rootProject.projectDir.toPath().resolve("paper-api-generator/generated")
+val generatedDir: java.nio.file.Path = layout.projectDirectory.dir("src/generated/java").asFile.toPath()
 idea {
     module {
-        generatedSourceDirs.add(generatedApiPath.toFile())
+        generatedSourceDirs.add(generatedDir.toFile())
     }
 }
 sourceSets {
     main {
         java {
-            srcDir(generatedApiPath)
+            srcDir(generatedDir)
         }
     }
 }
@@ -176,18 +176,18 @@ tasks.withType<Javadoc> {
         "https://guava.dev/releases/33.3.1-jre/api/docs/",
         "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
         "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/",
-        "https://javadoc.io/doc/org.joml/joml/1.10.8/index.html",
+        "https://javadoc.io/doc/org.joml/joml/1.10.8/",
         "https://www.javadoc.io/doc/com.google.code.gson/gson/2.11.0",
         "https://jspecify.dev/docs/api/",
-        "https://jd.advntr.dev/api/$adventureVersion/",
+        "https://jd.advntr.dev/api/$adventureJavadocVersion/",
-        "https://jd.advntr.dev/key/$adventureVersion/",
+        "https://jd.advntr.dev/key/$adventureJavadocVersion/",
-        "https://jd.advntr.dev/text-minimessage/$adventureVersion/",
+        "https://jd.advntr.dev/text-minimessage/$adventureJavadocVersion/",
-        "https://jd.advntr.dev/text-serializer-gson/$adventureVersion/",
+        "https://jd.advntr.dev/text-serializer-gson/$adventureJavadocVersion/",
-        "https://jd.advntr.dev/text-serializer-legacy/$adventureVersion/",
+        "https://jd.advntr.dev/text-serializer-legacy/$adventureJavadocVersion/",
-        "https://jd.advntr.dev/text-serializer-plain/$adventureVersion/",
+        "https://jd.advntr.dev/text-serializer-plain/$adventureJavadocVersion/",
-        "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/",
+        "https://jd.advntr.dev/text-logger-slf4j/$adventureJavadocVersion/",
         "https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/",
-        "https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/$log4jVersion/",
+        "https://logging.apache.org/log4j/2.x/javadoc/log4j-api/",
         "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.7.3",
     )
     options.tags("apiNote:a:API Note:")
@@ -228,21 +228,23 @@ tasks.compileTestJava {
     options.compilerArgs.add("-parameters")
 }
 
-val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.ScanJarForBadCalls::class) {
+val scanJarForBadCalls by tasks.registering(io.papermc.paperweight.tasks.ScanJarForBadCalls::class) {
     badAnnotations.add("Lio/papermc/paper/annotation/DoNotUse;")
     jarToScan.set(tasks.jar.flatMap { it.archiveFile })
     classpath.from(configurations.compileClasspath)
 }
 tasks.check {
-    dependsOn(scanJar)
+    dependsOn(scanJarForBadCalls)
 }
 
-val scanJarForOldGeneratedCode = tasks.register("scanJarForOldGeneratedCode", io.papermc.paperweight.tasks.ScanJarForOldGeneratedCode::class) {
+if (providers.gradleProperty("updatingMinecraft").getOrElse("false").toBoolean()) {
-    mcVersion.set(providers.gradleProperty("mcVersion"))
+    val scanJarForOldGeneratedCode by tasks.registering(io.papermc.paperweight.tasks.ScanJarForOldGeneratedCode::class) {
-    annotation.set("Lio/papermc/paper/generated/GeneratedFrom;")
+        mcVersion.set(providers.gradleProperty("mcVersion"))
-    jarToScan.set(tasks.jar.flatMap { it.archiveFile })
+        annotation.set("Lio/papermc/paper/generated/GeneratedFrom;")
-    classpath.from(configurations.compileClasspath)
+        jarToScan.set(tasks.jar.flatMap { it.archiveFile })
-}
+        classpath.from(configurations.compileClasspath)
-tasks.check {
+    }
-    dependsOn(scanJarForOldGeneratedCode)
+    tasks.check {
+        dependsOn(scanJarForOldGeneratedCode)
+    }
 }

paper-api/src/generated/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java

@@ -66,8 +66,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
+@GeneratedFrom("1.21.5")
 public interface VanillaGoal<T extends Mob> extends Goal<T> {
     GoalKey<AbstractHorse> RANDOM_STAND = create("random_stand", AbstractHorse.class);
 

paper-api/src/generated/java/io/papermc/paper/registry/keys/AttributeKeys.java

@@ -7,7 +7,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.attribute.Attribute;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -23,9 +22,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.5")
 public final class AttributeKeys {
     /**
      * {@code minecraft:armor}

paper-api/src/generated/java/io/papermc/paper/registry/keys/BannerPatternKeys.java

@@ -7,7 +7,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.block.banner.PatternType;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -23,9 +22,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.5")
 public final class BannerPatternKeys {
     /**
      * {@code minecraft:base}
@@ -332,12 +330,11 @@ public final class BannerPatternKeys {
     }
 
     /**
-     * Creates a key for {@link PatternType} in the registry {@code minecraft:banner_pattern}.
+     * Creates a typed key for {@link PatternType} in the registry {@code minecraft:banner_pattern}.
      *
      * @param key the value's key in the registry
      * @return a new typed key
      */
-    @ApiStatus.Experimental
     public static TypedKey<PatternType> create(final Key key) {
         return TypedKey.create(RegistryKey.BANNER_PATTERN, key);
     }

paper-api/src/generated/java/io/papermc/paper/registry/keys/BiomeKeys.java

@@ -7,7 +7,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.block.Biome;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -23,9 +22,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.5")
 public final class BiomeKeys {
     /**
      * {@code minecraft:badlands}
@@ -486,12 +484,11 @@ public final class BiomeKeys {
     }
 
     /**
-     * Creates a key for {@link Biome} in the registry {@code minecraft:worldgen/biome}.
+     * Creates a typed key for {@link Biome} in the registry {@code minecraft:worldgen/biome}.
      *
      * @param key the value's key in the registry
      * @return a new typed key
      */
-    @ApiStatus.Experimental
     public static TypedKey<Biome> create(final Key key) {
         return TypedKey.create(RegistryKey.BIOME, key);
     }

paper-api/src/generated/java/io/papermc/paper/registry/keys/BlockTypeKeys.java

@@ -7,7 +7,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.block.BlockType;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -23,9 +22,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.5")
 public final class BlockTypeKeys {
     /**
      * {@code minecraft:acacia_button}
@@ -1063,6 +1061,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> BUDDING_AMETHYST = create(key("budding_amethyst"));
 
+    /**
+     * {@code minecraft:bush}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> BUSH = create(key("bush"));
+
     /**
      * {@code minecraft:cactus}
      *
@@ -1070,6 +1075,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> CACTUS = create(key("cactus"));
 
+    /**
+     * {@code minecraft:cactus_flower}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> CACTUS_FLOWER = create(key("cactus_flower"));
+
     /**
      * {@code minecraft:cake}
      *
@@ -2687,6 +2699,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> FIRE_CORAL_WALL_FAN = create(key("fire_coral_wall_fan"));
 
+    /**
+     * {@code minecraft:firefly_bush}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> FIREFLY_BUSH = create(key("firefly_bush"));
+
     /**
      * {@code minecraft:fletching_table}
      *
@@ -3408,6 +3427,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> LAVA_CAULDRON = create(key("lava_cauldron"));
 
+    /**
+     * {@code minecraft:leaf_litter}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> LEAF_LITTER = create(key("leaf_litter"));
+
     /**
      * {@code minecraft:lectern}
      *
@@ -6082,6 +6108,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> SEAGRASS = create(key("seagrass"));
 
+    /**
+     * {@code minecraft:short_dry_grass}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> SHORT_DRY_GRASS = create(key("short_dry_grass"));
+
     /**
      * {@code minecraft:short_grass}
      *
@@ -6733,6 +6766,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> SWEET_BERRY_BUSH = create(key("sweet_berry_bush"));
 
+    /**
+     * {@code minecraft:tall_dry_grass}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> TALL_DRY_GRASS = create(key("tall_dry_grass"));
+
     /**
      * {@code minecraft:tall_grass}
      *
@@ -6761,6 +6801,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> TERRACOTTA = create(key("terracotta"));
 
+    /**
+     * {@code minecraft:test_block}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> TEST_BLOCK = create(key("test_block"));
+
+    /**
+     * {@code minecraft:test_instance_block}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> TEST_INSTANCE_BLOCK = create(key("test_instance_block"));
+
     /**
      * {@code minecraft:tinted_glass}
      *
@@ -7559,6 +7613,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> WHITE_WOOL = create(key("white_wool"));
 
+    /**
+     * {@code minecraft:wildflowers}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WILDFLOWERS = create(key("wildflowers"));
+
     /**
      * {@code minecraft:wither_rose}
      *

paper-api/src/generated/java/io/papermc/paper/registry/keys/CatVariantKeys.java

@@ -7,7 +7,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.entity.Cat;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -23,9 +22,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.5")
 public final class CatVariantKeys {
     /**
      * {@code minecraft:all_black}
@@ -107,7 +105,13 @@ public final class CatVariantKeys {
     private CatVariantKeys() {
     }
 
-    private static TypedKey<Cat.Type> create(final Key key) {
+    /**
+     * Creates a typed key for {@link Cat.Type} in the registry {@code minecraft:cat_variant}.
+     *
+     * @param key the value's key in the registry
+     * @return a new typed key
+     */
+    public static TypedKey<Cat.Type> create(final Key key) {
         return TypedKey.create(RegistryKey.CAT_VARIANT, key);
     }
 }

paper-api/src/generated/java/io/papermc/paper/registry/keys/ChickenVariantKeys.java

@@ -0,0 +1,61 @@
+package io.papermc.paper.registry.keys;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.TypedKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.entity.Chicken;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#CHICKEN_VARIANT}.
+ *
+ * @apiNote The fields provided here are a direct representation of
+ * what is available from the vanilla game source. They may be
+ * changed (including removals) on any Minecraft version
+ * bump, so cross-version compatibility is not provided on the
+ * same level as it is on most of the other API.
+ */
+@SuppressWarnings({
+        "unused",
+        "SpellCheckingInspection"
+})
+@NullMarked
+@GeneratedFrom("1.21.5")
+public final class ChickenVariantKeys {
+    /**
+     * {@code minecraft:cold}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Chicken.Variant> COLD = create(key("cold"));
+
+    /**
+     * {@code minecraft:temperate}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Chicken.Variant> TEMPERATE = create(key("temperate"));
+
+    /**
+     * {@code minecraft:warm}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Chicken.Variant> WARM = create(key("warm"));
+
+    private ChickenVariantKeys() {
+    }
+
+    /**
+     * Creates a typed key for {@link Chicken.Variant} in the registry {@code minecraft:chicken_variant}.
+     *
+     * @param key the value's key in the registry
+     * @return a new typed key
+     */
+    public static TypedKey<Chicken.Variant> create(final Key key) {
+        return TypedKey.create(RegistryKey.CHICKEN_VARIANT, key);
+    }
+}

paper-api/src/generated/java/io/papermc/paper/registry/keys/CowVariantKeys.java

@@ -0,0 +1,61 @@
+package io.papermc.paper.registry.keys;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.TypedKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.entity.Cow;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#COW_VARIANT}.
+ *
+ * @apiNote The fields provided here are a direct representation of
+ * what is available from the vanilla game source. They may be
+ * changed (including removals) on any Minecraft version
+ * bump, so cross-version compatibility is not provided on the
+ * same level as it is on most of the other API.
+ */
+@SuppressWarnings({
+        "unused",
+        "SpellCheckingInspection"
+})
+@NullMarked
+@GeneratedFrom("1.21.5")
+public final class CowVariantKeys {
+    /**
+     * {@code minecraft:cold}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Cow.Variant> COLD = create(key("cold"));
+
+    /**
+     * {@code minecraft:temperate}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Cow.Variant> TEMPERATE = create(key("temperate"));
+
+    /**
+     * {@code minecraft:warm}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Cow.Variant> WARM = create(key("warm"));
+
+    private CowVariantKeys() {
+    }
+
+    /**
+     * Creates a typed key for {@link Cow.Variant} in the registry {@code minecraft:cow_variant}.
+     *
+     * @param key the value's key in the registry
+     * @return a new typed key
+     */
+    public static TypedKey<Cow.Variant> create(final Key key) {
+        return TypedKey.create(RegistryKey.COW_VARIANT, key);
+    }
+}

paper-api/src/generated/java/io/papermc/paper/registry/keys/DamageTypeKeys.java

@@ -7,7 +7,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.damage.DamageType;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -23,9 +22,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.5")
 public final class DamageTypeKeys {
     /**
      * {@code minecraft:arrow}
@@ -374,12 +372,11 @@ public final class DamageTypeKeys {
     }
 
     /**
-     * Creates a key for {@link DamageType} in the registry {@code minecraft:damage_type}.
+     * Creates a typed key for {@link DamageType} in the registry {@code minecraft:damage_type}.
      *
      * @param key the value's key in the registry
      * @return a new typed key
      */
-    @ApiStatus.Experimental
     public static TypedKey<DamageType> create(final Key key) {
         return TypedKey.create(RegistryKey.DAMAGE_TYPE, key);
     }

paper-api/src/generated/java/io/papermc/paper/registry/keys/DataComponentTypeKeys.java

@@ -0,0 +1,706 @@
+package io.papermc.paper.registry.keys;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.datacomponent.DataComponentType;
+import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.TypedKey;
+import net.kyori.adventure.key.Key;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#DATA_COMPONENT_TYPE}.
+ *
+ * @apiNote The fields provided here are a direct representation of
+ * what is available from the vanilla game source. They may be
+ * changed (including removals) on any Minecraft version
+ * bump, so cross-version compatibility is not provided on the
+ * same level as it is on most of the other API.
+ */
+@SuppressWarnings({
+        "unused",
+        "SpellCheckingInspection"
+})
+@NullMarked
+@GeneratedFrom("1.21.5")
+public final class DataComponentTypeKeys {
+    /**
+     * {@code minecraft:attribute_modifiers}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> ATTRIBUTE_MODIFIERS = create(key("attribute_modifiers"));
+
+    /**
+     * {@code minecraft:axolotl/variant}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> AXOLOTL_VARIANT = create(key("axolotl/variant"));
+
+    /**
+     * {@code minecraft:banner_patterns}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> BANNER_PATTERNS = create(key("banner_patterns"));
+
+    /**
+     * {@code minecraft:base_color}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> BASE_COLOR = create(key("base_color"));
+
+    /**
+     * {@code minecraft:bees}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> BEES = create(key("bees"));
+
+    /**
+     * {@code minecraft:block_entity_data}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> BLOCK_ENTITY_DATA = create(key("block_entity_data"));
+
+    /**
+     * {@code minecraft:block_state}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> BLOCK_STATE = create(key("block_state"));
+
+    /**
+     * {@code minecraft:blocks_attacks}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> BLOCKS_ATTACKS = create(key("blocks_attacks"));
+
+    /**
+     * {@code minecraft:break_sound}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> BREAK_SOUND = create(key("break_sound"));
+
+    /**
+     * {@code minecraft:bucket_entity_data}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> BUCKET_ENTITY_DATA = create(key("bucket_entity_data"));
+
+    /**
+     * {@code minecraft:bundle_contents}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> BUNDLE_CONTENTS = create(key("bundle_contents"));
+
+    /**
+     * {@code minecraft:can_break}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> CAN_BREAK = create(key("can_break"));
+
+    /**
+     * {@code minecraft:can_place_on}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> CAN_PLACE_ON = create(key("can_place_on"));
+
+    /**
+     * {@code minecraft:cat/collar}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> CAT_COLLAR = create(key("cat/collar"));
+
+    /**
+     * {@code minecraft:cat/variant}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> CAT_VARIANT = create(key("cat/variant"));
+
+    /**
+     * {@code minecraft:charged_projectiles}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> CHARGED_PROJECTILES = create(key("charged_projectiles"));
+
+    /**
+     * {@code minecraft:chicken/variant}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> CHICKEN_VARIANT = create(key("chicken/variant"));
+
+    /**
+     * {@code minecraft:consumable}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> CONSUMABLE = create(key("consumable"));
+
+    /**
+     * {@code minecraft:container}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> CONTAINER = create(key("container"));
+
+    /**
+     * {@code minecraft:container_loot}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> CONTAINER_LOOT = create(key("container_loot"));
+
+    /**
+     * {@code minecraft:cow/variant}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> COW_VARIANT = create(key("cow/variant"));
+
+    /**
+     * {@code minecraft:creative_slot_lock}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> CREATIVE_SLOT_LOCK = create(key("creative_slot_lock"));
+
+    /**
+     * {@code minecraft:custom_data}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> CUSTOM_DATA = create(key("custom_data"));
+
+    /**
+     * {@code minecraft:custom_model_data}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> CUSTOM_MODEL_DATA = create(key("custom_model_data"));
+
+    /**
+     * {@code minecraft:custom_name}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> CUSTOM_NAME = create(key("custom_name"));
+
+    /**
+     * {@code minecraft:damage}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> DAMAGE = create(key("damage"));
+
+    /**
+     * {@code minecraft:damage_resistant}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> DAMAGE_RESISTANT = create(key("damage_resistant"));
+
+    /**
+     * {@code minecraft:death_protection}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> DEATH_PROTECTION = create(key("death_protection"));
+
+    /**
+     * {@code minecraft:debug_stick_state}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> DEBUG_STICK_STATE = create(key("debug_stick_state"));
+
+    /**
+     * {@code minecraft:dyed_color}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> DYED_COLOR = create(key("dyed_color"));
+
+    /**
+     * {@code minecraft:enchantable}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> ENCHANTABLE = create(key("enchantable"));
+
+    /**
+     * {@code minecraft:enchantment_glint_override}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> ENCHANTMENT_GLINT_OVERRIDE = create(key("enchantment_glint_override"));
+
+    /**
+     * {@code minecraft:enchantments}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> ENCHANTMENTS = create(key("enchantments"));
+
+    /**
+     * {@code minecraft:entity_data}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> ENTITY_DATA = create(key("entity_data"));
+
+    /**
+     * {@code minecraft:equippable}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> EQUIPPABLE = create(key("equippable"));
+
+    /**
+     * {@code minecraft:firework_explosion}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> FIREWORK_EXPLOSION = create(key("firework_explosion"));
+
+    /**
+     * {@code minecraft:fireworks}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> FIREWORKS = create(key("fireworks"));
+
+    /**
+     * {@code minecraft:food}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> FOOD = create(key("food"));
+
+    /**
+     * {@code minecraft:fox/variant}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> FOX_VARIANT = create(key("fox/variant"));
+
+    /**
+     * {@code minecraft:frog/variant}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> FROG_VARIANT = create(key("frog/variant"));
+
+    /**
+     * {@code minecraft:glider}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> GLIDER = create(key("glider"));
+
+    /**
+     * {@code minecraft:horse/variant}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> HORSE_VARIANT = create(key("horse/variant"));
+
+    /**
+     * {@code minecraft:instrument}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> INSTRUMENT = create(key("instrument"));
+
+    /**
+     * {@code minecraft:intangible_projectile}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> INTANGIBLE_PROJECTILE = create(key("intangible_projectile"));
+
+    /**
+     * {@code minecraft:item_model}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> ITEM_MODEL = create(key("item_model"));
+
+    /**
+     * {@code minecraft:item_name}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> ITEM_NAME = create(key("item_name"));
+
+    /**
+     * {@code minecraft:jukebox_playable}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> JUKEBOX_PLAYABLE = create(key("jukebox_playable"));
+
+    /**
+     * {@code minecraft:llama/variant}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> LLAMA_VARIANT = create(key("llama/variant"));
+
+    /**
+     * {@code minecraft:lock}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> LOCK = create(key("lock"));
+
+    /**
+     * {@code minecraft:lodestone_tracker}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> LODESTONE_TRACKER = create(key("lodestone_tracker"));
+
+    /**
+     * {@code minecraft:lore}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> LORE = create(key("lore"));
+
+    /**
+     * {@code minecraft:map_color}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> MAP_COLOR = create(key("map_color"));
+
+    /**
+     * {@code minecraft:map_decorations}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> MAP_DECORATIONS = create(key("map_decorations"));
+
+    /**
+     * {@code minecraft:map_id}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> MAP_ID = create(key("map_id"));
+
+    /**
+     * {@code minecraft:map_post_processing}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> MAP_POST_PROCESSING = create(key("map_post_processing"));
+
+    /**
+     * {@code minecraft:max_damage}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> MAX_DAMAGE = create(key("max_damage"));
+
+    /**
+     * {@code minecraft:max_stack_size}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> MAX_STACK_SIZE = create(key("max_stack_size"));
+
+    /**
+     * {@code minecraft:mooshroom/variant}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> MOOSHROOM_VARIANT = create(key("mooshroom/variant"));
+
+    /**
+     * {@code minecraft:note_block_sound}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> NOTE_BLOCK_SOUND = create(key("note_block_sound"));
+
+    /**
+     * {@code minecraft:ominous_bottle_amplifier}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> OMINOUS_BOTTLE_AMPLIFIER = create(key("ominous_bottle_amplifier"));
+
+    /**
+     * {@code minecraft:painting/variant}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> PAINTING_VARIANT = create(key("painting/variant"));
+
+    /**
+     * {@code minecraft:parrot/variant}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> PARROT_VARIANT = create(key("parrot/variant"));
+
+    /**
+     * {@code minecraft:pig/variant}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> PIG_VARIANT = create(key("pig/variant"));
+
+    /**
+     * {@code minecraft:pot_decorations}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> POT_DECORATIONS = create(key("pot_decorations"));
+
+    /**
+     * {@code minecraft:potion_contents}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> POTION_CONTENTS = create(key("potion_contents"));
+
+    /**
+     * {@code minecraft:potion_duration_scale}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> POTION_DURATION_SCALE = create(key("potion_duration_scale"));
+
+    /**
+     * {@code minecraft:profile}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> PROFILE = create(key("profile"));
+
+    /**
+     * {@code minecraft:provides_banner_patterns}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> PROVIDES_BANNER_PATTERNS = create(key("provides_banner_patterns"));
+
+    /**
+     * {@code minecraft:provides_trim_material}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> PROVIDES_TRIM_MATERIAL = create(key("provides_trim_material"));
+
+    /**
+     * {@code minecraft:rabbit/variant}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> RABBIT_VARIANT = create(key("rabbit/variant"));
+
+    /**
+     * {@code minecraft:rarity}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> RARITY = create(key("rarity"));
+
+    /**
+     * {@code minecraft:recipes}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> RECIPES = create(key("recipes"));
+
+    /**
+     * {@code minecraft:repair_cost}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> REPAIR_COST = create(key("repair_cost"));
+
+    /**
+     * {@code minecraft:repairable}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> REPAIRABLE = create(key("repairable"));
+
+    /**
+     * {@code minecraft:salmon/size}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> SALMON_SIZE = create(key("salmon/size"));
+
+    /**
+     * {@code minecraft:sheep/color}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> SHEEP_COLOR = create(key("sheep/color"));
+
+    /**
+     * {@code minecraft:shulker/color}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> SHULKER_COLOR = create(key("shulker/color"));
+
+    /**
+     * {@code minecraft:stored_enchantments}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> STORED_ENCHANTMENTS = create(key("stored_enchantments"));
+
+    /**
+     * {@code minecraft:suspicious_stew_effects}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> SUSPICIOUS_STEW_EFFECTS = create(key("suspicious_stew_effects"));
+
+    /**
+     * {@code minecraft:tool}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> TOOL = create(key("tool"));
+
+    /**
+     * {@code minecraft:tooltip_display}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> TOOLTIP_DISPLAY = create(key("tooltip_display"));
+
+    /**
+     * {@code minecraft:tooltip_style}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> TOOLTIP_STYLE = create(key("tooltip_style"));
+
+    /**
+     * {@code minecraft:trim}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> TRIM = create(key("trim"));
+
+    /**
+     * {@code minecraft:tropical_fish/base_color}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> TROPICAL_FISH_BASE_COLOR = create(key("tropical_fish/base_color"));
+
+    /**
+     * {@code minecraft:tropical_fish/pattern}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> TROPICAL_FISH_PATTERN = create(key("tropical_fish/pattern"));
+
+    /**
+     * {@code minecraft:tropical_fish/pattern_color}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> TROPICAL_FISH_PATTERN_COLOR = create(key("tropical_fish/pattern_color"));
+
+    /**
+     * {@code minecraft:unbreakable}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> UNBREAKABLE = create(key("unbreakable"));
+
+    /**
+     * {@code minecraft:use_cooldown}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> USE_COOLDOWN = create(key("use_cooldown"));
+
+    /**
+     * {@code minecraft:use_remainder}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> USE_REMAINDER = create(key("use_remainder"));
+
+    /**
+     * {@code minecraft:villager/variant}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> VILLAGER_VARIANT = create(key("villager/variant"));
+
+    /**
+     * {@code minecraft:weapon}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> WEAPON = create(key("weapon"));
+
+    /**
+     * {@code minecraft:wolf/collar}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> WOLF_COLLAR = create(key("wolf/collar"));
+
+    /**
+     * {@code minecraft:wolf/sound_variant}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> WOLF_SOUND_VARIANT = create(key("wolf/sound_variant"));
+
+    /**
+     * {@code minecraft:wolf/variant}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> WOLF_VARIANT = create(key("wolf/variant"));
+
+    /**
+     * {@code minecraft:writable_book_content}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> WRITABLE_BOOK_CONTENT = create(key("writable_book_content"));
+
+    /**
+     * {@code minecraft:written_book_content}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> WRITTEN_BOOK_CONTENT = create(key("written_book_content"));
+
+    private DataComponentTypeKeys() {
+    }
+
+    private static TypedKey<DataComponentType> create(final Key key) {
+        return TypedKey.create(RegistryKey.DATA_COMPONENT_TYPE, key);
+    }
+}

paper-api/src/generated/java/io/papermc/paper/registry/keys/EnchantmentKeys.java

@@ -7,7 +7,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.enchantments.Enchantment;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -23,9 +22,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.5")
 public final class EnchantmentKeys {
     /**
      * {@code minecraft:aqua_affinity}
@@ -325,12 +323,11 @@ public final class EnchantmentKeys {
     }
 
     /**
-     * Creates a key for {@link Enchantment} in the registry {@code minecraft:enchantment}.
+     * Creates a typed key for {@link Enchantment} in the registry {@code minecraft:enchantment}.
      *
      * @param key the value's key in the registry
      * @return a new typed key
      */
-    @ApiStatus.Experimental
     public static TypedKey<Enchantment> create(final Key key) {
         return TypedKey.create(RegistryKey.ENCHANTMENT, key);
     }

paper-api/src/generated/java/io/papermc/paper/registry/keys/FluidKeys.java

@@ -7,7 +7,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.Fluid;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -23,9 +22,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.5")
 public final class FluidKeys {
     /**
      * {@code minecraft:empty}

paper-api/src/generated/java/io/papermc/paper/registry/keys/FrogVariantKeys.java

@@ -7,7 +7,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.entity.Frog;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -23,9 +22,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.5")
 public final class FrogVariantKeys {
     /**
      * {@code minecraft:cold}
@@ -51,7 +49,13 @@ public final class FrogVariantKeys {
     private FrogVariantKeys() {
     }
 
-    private static TypedKey<Frog.Variant> create(final Key key) {
+    /**
+     * Creates a typed key for {@link Frog.Variant} in the registry {@code minecraft:frog_variant}.
+     *
+     * @param key the value's key in the registry
+     * @return a new typed key
+     */
+    public static TypedKey<Frog.Variant> create(final Key key) {
         return TypedKey.create(RegistryKey.FROG_VARIANT, key);
     }
 }

paper-api/src/generated/java/io/papermc/paper/registry/keys/GameEventKeys.java

@@ -7,7 +7,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.GameEvent;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -23,9 +22,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.5")
 public final class GameEventKeys {
     /**
      * {@code minecraft:block_activate}
@@ -451,12 +449,11 @@ public final class GameEventKeys {
     }
 
     /**
-     * Creates a key for {@link GameEvent} in the registry {@code minecraft:game_event}.
+     * Creates a typed key for {@link GameEvent} in the registry {@code minecraft:game_event}.
      *
      * @param key the value's key in the registry
      * @return a new typed key
      */
-    @ApiStatus.Experimental
     public static TypedKey<GameEvent> create(final Key key) {
         return TypedKey.create(RegistryKey.GAME_EVENT, key);
     }

paper-api/src/generated/java/io/papermc/paper/registry/keys/InstrumentKeys.java

@@ -7,7 +7,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.MusicInstrument;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -23,9 +22,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.5")
 public final class InstrumentKeys {
     /**
      * {@code minecraft:admire_goat_horn}
@@ -87,12 +85,11 @@ public final class InstrumentKeys {
     }
 
     /**
-     * Creates a key for {@link MusicInstrument} in the registry {@code minecraft:instrument}.
+     * Creates a typed key for {@link MusicInstrument} in the registry {@code minecraft:instrument}.
      *
      * @param key the value's key in the registry
      * @return a new typed key
      */
-    @ApiStatus.Experimental
     public static TypedKey<MusicInstrument> create(final Key key) {
         return TypedKey.create(RegistryKey.INSTRUMENT, key);
     }

paper-api/src/generated/java/io/papermc/paper/registry/keys/JukeboxSongKeys.java

@@ -7,7 +7,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.JukeboxSong;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -23,9 +22,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.5")
 public final class JukeboxSongKeys {
     /**
      * {@code minecraft:11}
@@ -164,12 +162,11 @@ public final class JukeboxSongKeys {
     }
 
     /**
-     * Creates a key for {@link JukeboxSong} in the registry {@code minecraft:jukebox_song}.
+     * Creates a typed key for {@link JukeboxSong} in the registry {@code minecraft:jukebox_song}.
      *
      * @param key the value's key in the registry
      * @return a new typed key
      */
-    @ApiStatus.Experimental
     public static TypedKey<JukeboxSong> create(final Key key) {
         return TypedKey.create(RegistryKey.JUKEBOX_SONG, key);
     }

paper-api/src/generated/java/io/papermc/paper/registry/keys/MapDecorationTypeKeys.java

@@ -7,7 +7,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.map.MapCursor;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -23,9 +22,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.5")
 public final class MapDecorationTypeKeys {
     /**
      * {@code minecraft:banner_black}

paper-api/src/generated/java/io/papermc/paper/registry/keys/MenuTypeKeys.java

@@ -7,7 +7,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.inventory.MenuType;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -23,9 +22,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.5")
 public final class MenuTypeKeys {
     /**
      * {@code minecraft:anvil}

paper-api/src/generated/java/io/papermc/paper/registry/keys/MobEffectKeys.java

@@ -7,7 +7,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.potion.PotionEffectType;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -23,9 +22,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.5")
 public final class MobEffectKeys {
     /**
      * {@code minecraft:absorption}

paper-api/src/generated/java/io/papermc/paper/registry/keys/PaintingVariantKeys.java

@@ -7,7 +7,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.Art;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -23,9 +22,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.5")
 public final class PaintingVariantKeys {
     /**
      * {@code minecraft:alban}
@@ -381,12 +379,11 @@ public final class PaintingVariantKeys {
     }
 
     /**
-     * Creates a key for {@link Art} in the registry {@code minecraft:painting_variant}.
+     * Creates a typed key for {@link Art} in the registry {@code minecraft:painting_variant}.
      *
      * @param key the value's key in the registry
      * @return a new typed key
      */
-    @ApiStatus.Experimental
     public static TypedKey<Art> create(final Key key) {
         return TypedKey.create(RegistryKey.PAINTING_VARIANT, key);
     }

paper-api/src/generated/java/io/papermc/paper/registry/keys/PigVariantKeys.java

@@ -0,0 +1,61 @@
+package io.papermc.paper.registry.keys;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.TypedKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.entity.Pig;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#PIG_VARIANT}.
+ *
+ * @apiNote The fields provided here are a direct representation of
+ * what is available from the vanilla game source. They may be
+ * changed (including removals) on any Minecraft version
+ * bump, so cross-version compatibility is not provided on the
+ * same level as it is on most of the other API.
+ */
+@SuppressWarnings({
+        "unused",
+        "SpellCheckingInspection"
+})
+@NullMarked
+@GeneratedFrom("1.21.5")
+public final class PigVariantKeys {
+    /**
+     * {@code minecraft:cold}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Pig.Variant> COLD = create(key("cold"));
+
+    /**
+     * {@code minecraft:temperate}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Pig.Variant> TEMPERATE = create(key("temperate"));
+
+    /**
+     * {@code minecraft:warm}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Pig.Variant> WARM = create(key("warm"));
+
+    private PigVariantKeys() {
+    }
+
+    /**
+     * Creates a typed key for {@link Pig.Variant} in the registry {@code minecraft:pig_variant}.
+     *
+     * @param key the value's key in the registry
+     * @return a new typed key
+     */
+    public static TypedKey<Pig.Variant> create(final Key key) {
+        return TypedKey.create(RegistryKey.PIG_VARIANT, key);
+    }
+}

paper-api/src/generated/java/io/papermc/paper/registry/keys/SoundEventKeys.java

@@ -7,7 +7,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.Sound;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -23,9 +22,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.5")
 public final class SoundEventKeys {
     /**
      * {@code minecraft:ambient.basalt_deltas.additions}
@@ -881,6 +879,20 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> BLOCK_BUBBLE_COLUMN_WHIRLPOOL_INSIDE = create(key("block.bubble_column.whirlpool_inside"));
 
+    /**
+     * {@code minecraft:block.cactus_flower.break}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_CACTUS_FLOWER_BREAK = create(key("block.cactus_flower.break"));
+
+    /**
+     * {@code minecraft:block.cactus_flower.place}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_CACTUS_FLOWER_PLACE = create(key("block.cactus_flower.place"));
+
     /**
      * {@code minecraft:block.cake.add_candle}
      *
@@ -1728,6 +1740,13 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> BLOCK_CROP_BREAK = create(key("block.crop.break"));
 
+    /**
+     * {@code minecraft:block.deadbush.idle}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_DEADBUSH_IDLE = create(key("block.deadbush.idle"));
+
     /**
      * {@code minecraft:block.decorated_pot.break}
      *
@@ -2050,6 +2069,13 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> BLOCK_FIRE_EXTINGUISH = create(key("block.fire.extinguish"));
 
+    /**
+     * {@code minecraft:block.firefly_bush.idle}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_FIREFLY_BUSH_IDLE = create(key("block.firefly_bush.idle"));
+
     /**
      * {@code minecraft:block.flowering_azalea.break}
      *
@@ -2512,6 +2538,41 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> BLOCK_HONEY_BLOCK_STEP = create(key("block.honey_block.step"));
 
+    /**
+     * {@code minecraft:block.iron.break}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_IRON_BREAK = create(key("block.iron.break"));
+
+    /**
+     * {@code minecraft:block.iron.fall}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_IRON_FALL = create(key("block.iron.fall"));
+
+    /**
+     * {@code minecraft:block.iron.hit}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_IRON_HIT = create(key("block.iron.hit"));
+
+    /**
+     * {@code minecraft:block.iron.place}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_IRON_PLACE = create(key("block.iron.place"));
+
+    /**
+     * {@code minecraft:block.iron.step}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_IRON_STEP = create(key("block.iron.step"));
+
     /**
      * {@code minecraft:block.iron_door.close}
      *
@@ -2645,6 +2706,41 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> BLOCK_LAVA_POP = create(key("block.lava.pop"));
 
+    /**
+     * {@code minecraft:block.leaf_litter.break}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_LEAF_LITTER_BREAK = create(key("block.leaf_litter.break"));
+
+    /**
+     * {@code minecraft:block.leaf_litter.fall}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_LEAF_LITTER_FALL = create(key("block.leaf_litter.fall"));
+
+    /**
+     * {@code minecraft:block.leaf_litter.hit}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_LEAF_LITTER_HIT = create(key("block.leaf_litter.hit"));
+
+    /**
+     * {@code minecraft:block.leaf_litter.place}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_LEAF_LITTER_PLACE = create(key("block.leaf_litter.place"));
+
+    /**
+     * {@code minecraft:block.leaf_litter.step}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_LEAF_LITTER_STEP = create(key("block.leaf_litter.step"));
+
     /**
      * {@code minecraft:block.lever.click}
      *
@@ -3996,6 +4092,13 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> BLOCK_SAND_HIT = create(key("block.sand.hit"));
 
+    /**
+     * {@code minecraft:block.sand.idle}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_SAND_IDLE = create(key("block.sand.idle"));
+
     /**
      * {@code minecraft:block.sand.place}
      *
@@ -4010,6 +4113,13 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> BLOCK_SAND_STEP = create(key("block.sand.step"));
 
+    /**
+     * {@code minecraft:block.sand.wind}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_SAND_WIND = create(key("block.sand.wind"));
+
     /**
      * {@code minecraft:block.scaffolding.break}
      *
@@ -10219,13 +10329,6 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> ENTITY_WOLF_GROWL = create(key("entity.wolf.growl"));
 
-    /**
-     * {@code minecraft:entity.wolf.howl}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_HOWL = create(key("entity.wolf.howl"));
-
     /**
      * {@code minecraft:entity.wolf.hurt}
      *
@@ -10261,6 +10364,258 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> ENTITY_WOLF_WHINE = create(key("entity.wolf.whine"));
 
+    /**
+     * {@code minecraft:entity.wolf_angry.ambient}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_ANGRY_AMBIENT = create(key("entity.wolf_angry.ambient"));
+
+    /**
+     * {@code minecraft:entity.wolf_angry.death}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_ANGRY_DEATH = create(key("entity.wolf_angry.death"));
+
+    /**
+     * {@code minecraft:entity.wolf_angry.growl}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_ANGRY_GROWL = create(key("entity.wolf_angry.growl"));
+
+    /**
+     * {@code minecraft:entity.wolf_angry.hurt}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_ANGRY_HURT = create(key("entity.wolf_angry.hurt"));
+
+    /**
+     * {@code minecraft:entity.wolf_angry.pant}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_ANGRY_PANT = create(key("entity.wolf_angry.pant"));
+
+    /**
+     * {@code minecraft:entity.wolf_angry.whine}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_ANGRY_WHINE = create(key("entity.wolf_angry.whine"));
+
+    /**
+     * {@code minecraft:entity.wolf_big.ambient}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_BIG_AMBIENT = create(key("entity.wolf_big.ambient"));
+
+    /**
+     * {@code minecraft:entity.wolf_big.death}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_BIG_DEATH = create(key("entity.wolf_big.death"));
+
+    /**
+     * {@code minecraft:entity.wolf_big.growl}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_BIG_GROWL = create(key("entity.wolf_big.growl"));
+
+    /**
+     * {@code minecraft:entity.wolf_big.hurt}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_BIG_HURT = create(key("entity.wolf_big.hurt"));
+
+    /**
+     * {@code minecraft:entity.wolf_big.pant}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_BIG_PANT = create(key("entity.wolf_big.pant"));
+
+    /**
+     * {@code minecraft:entity.wolf_big.whine}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_BIG_WHINE = create(key("entity.wolf_big.whine"));
+
+    /**
+     * {@code minecraft:entity.wolf_cute.ambient}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_CUTE_AMBIENT = create(key("entity.wolf_cute.ambient"));
+
+    /**
+     * {@code minecraft:entity.wolf_cute.death}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_CUTE_DEATH = create(key("entity.wolf_cute.death"));
+
+    /**
+     * {@code minecraft:entity.wolf_cute.growl}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_CUTE_GROWL = create(key("entity.wolf_cute.growl"));
+
+    /**
+     * {@code minecraft:entity.wolf_cute.hurt}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_CUTE_HURT = create(key("entity.wolf_cute.hurt"));
+
+    /**
+     * {@code minecraft:entity.wolf_cute.pant}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_CUTE_PANT = create(key("entity.wolf_cute.pant"));
+
+    /**
+     * {@code minecraft:entity.wolf_cute.whine}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_CUTE_WHINE = create(key("entity.wolf_cute.whine"));
+
+    /**
+     * {@code minecraft:entity.wolf_grumpy.ambient}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_GRUMPY_AMBIENT = create(key("entity.wolf_grumpy.ambient"));
+
+    /**
+     * {@code minecraft:entity.wolf_grumpy.death}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_GRUMPY_DEATH = create(key("entity.wolf_grumpy.death"));
+
+    /**
+     * {@code minecraft:entity.wolf_grumpy.growl}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_GRUMPY_GROWL = create(key("entity.wolf_grumpy.growl"));
+
+    /**
+     * {@code minecraft:entity.wolf_grumpy.hurt}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_GRUMPY_HURT = create(key("entity.wolf_grumpy.hurt"));
+
+    /**
+     * {@code minecraft:entity.wolf_grumpy.pant}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_GRUMPY_PANT = create(key("entity.wolf_grumpy.pant"));
+
+    /**
+     * {@code minecraft:entity.wolf_grumpy.whine}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_GRUMPY_WHINE = create(key("entity.wolf_grumpy.whine"));
+
+    /**
+     * {@code minecraft:entity.wolf_puglin.ambient}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_PUGLIN_AMBIENT = create(key("entity.wolf_puglin.ambient"));
+
+    /**
+     * {@code minecraft:entity.wolf_puglin.death}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_PUGLIN_DEATH = create(key("entity.wolf_puglin.death"));
+
+    /**
+     * {@code minecraft:entity.wolf_puglin.growl}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_PUGLIN_GROWL = create(key("entity.wolf_puglin.growl"));
+
+    /**
+     * {@code minecraft:entity.wolf_puglin.hurt}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_PUGLIN_HURT = create(key("entity.wolf_puglin.hurt"));
+
+    /**
+     * {@code minecraft:entity.wolf_puglin.pant}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_PUGLIN_PANT = create(key("entity.wolf_puglin.pant"));
+
+    /**
+     * {@code minecraft:entity.wolf_puglin.whine}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_PUGLIN_WHINE = create(key("entity.wolf_puglin.whine"));
+
+    /**
+     * {@code minecraft:entity.wolf_sad.ambient}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_SAD_AMBIENT = create(key("entity.wolf_sad.ambient"));
+
+    /**
+     * {@code minecraft:entity.wolf_sad.death}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_SAD_DEATH = create(key("entity.wolf_sad.death"));
+
+    /**
+     * {@code minecraft:entity.wolf_sad.growl}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_SAD_GROWL = create(key("entity.wolf_sad.growl"));
+
+    /**
+     * {@code minecraft:entity.wolf_sad.hurt}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_SAD_HURT = create(key("entity.wolf_sad.hurt"));
+
+    /**
+     * {@code minecraft:entity.wolf_sad.pant}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_SAD_PANT = create(key("entity.wolf_sad.pant"));
+
+    /**
+     * {@code minecraft:entity.wolf_sad.whine}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_SAD_WHINE = create(key("entity.wolf_sad.whine"));
+
     /**
      * {@code minecraft:entity.zoglin.ambient}
      *

paper-api/src/generated/java/io/papermc/paper/registry/keys/StructureKeys.java

@@ -7,7 +7,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.generator.structure.Structure;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -23,9 +22,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.5")
 public final class StructureKeys {
     /**
      * {@code minecraft:ancient_city}
@@ -269,12 +267,11 @@ public final class StructureKeys {
     }
 
     /**
-     * Creates a key for {@link Structure} in the registry {@code minecraft:worldgen/structure}.
+     * Creates a typed key for {@link Structure} in the registry {@code minecraft:worldgen/structure}.
      *
      * @param key the value's key in the registry
      * @return a new typed key
      */
-    @ApiStatus.Experimental
     public static TypedKey<Structure> create(final Key key) {
         return TypedKey.create(RegistryKey.STRUCTURE, key);
     }

paper-api/src/generated/java/io/papermc/paper/registry/keys/StructureTypeKeys.java

@@ -7,7 +7,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.generator.structure.StructureType;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -23,9 +22,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.5")
 public final class StructureTypeKeys {
     /**
      * {@code minecraft:buried_treasure}

paper-api/src/generated/java/io/papermc/paper/registry/keys/TrimMaterialKeys.java

@@ -7,7 +7,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.inventory.meta.trim.TrimMaterial;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -23,9 +22,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.5")
 public final class TrimMaterialKeys {
     /**
      * {@code minecraft:amethyst}
@@ -108,12 +106,11 @@ public final class TrimMaterialKeys {
     }
 
     /**
-     * Creates a key for {@link TrimMaterial} in the registry {@code minecraft:trim_material}.
+     * Creates a typed key for {@link TrimMaterial} in the registry {@code minecraft:trim_material}.
      *
      * @param key the value's key in the registry
      * @return a new typed key
      */
-    @ApiStatus.Experimental
     public static TypedKey<TrimMaterial> create(final Key key) {
         return TypedKey.create(RegistryKey.TRIM_MATERIAL, key);
     }

paper-api/src/generated/java/io/papermc/paper/registry/keys/TrimPatternKeys.java

@@ -7,7 +7,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.inventory.meta.trim.TrimPattern;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -23,9 +22,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.5")
 public final class TrimPatternKeys {
     /**
      * {@code minecraft:bolt}
@@ -157,12 +155,11 @@ public final class TrimPatternKeys {
     }
 
     /**
-     * Creates a key for {@link TrimPattern} in the registry {@code minecraft:trim_pattern}.
+     * Creates a typed key for {@link TrimPattern} in the registry {@code minecraft:trim_pattern}.
      *
      * @param key the value's key in the registry
      * @return a new typed key
      */
-    @ApiStatus.Experimental
     public static TypedKey<TrimPattern> create(final Key key) {
         return TypedKey.create(RegistryKey.TRIM_PATTERN, key);
     }

paper-api/src/generated/java/io/papermc/paper/registry/keys/VillagerProfessionKeys.java

@@ -7,7 +7,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.entity.Villager;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -23,9 +22,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.5")
 public final class VillagerProfessionKeys {
     /**
      * {@code minecraft:armorer}

paper-api/src/generated/java/io/papermc/paper/registry/keys/VillagerTypeKeys.java

@@ -7,7 +7,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.entity.Villager;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -23,9 +22,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.5")
 public final class VillagerTypeKeys {
     /**
      * {@code minecraft:desert}

paper-api/src/generated/java/io/papermc/paper/registry/keys/WolfSoundVariantKeys.java

@@ -0,0 +1,89 @@
+package io.papermc.paper.registry.keys;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.TypedKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.entity.Wolf;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#WOLF_SOUND_VARIANT}.
+ *
+ * @apiNote The fields provided here are a direct representation of
+ * what is available from the vanilla game source. They may be
+ * changed (including removals) on any Minecraft version
+ * bump, so cross-version compatibility is not provided on the
+ * same level as it is on most of the other API.
+ */
+@SuppressWarnings({
+        "unused",
+        "SpellCheckingInspection"
+})
+@NullMarked
+@GeneratedFrom("1.21.5")
+public final class WolfSoundVariantKeys {
+    /**
+     * {@code minecraft:angry}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Wolf.SoundVariant> ANGRY = create(key("angry"));
+
+    /**
+     * {@code minecraft:big}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Wolf.SoundVariant> BIG = create(key("big"));
+
+    /**
+     * {@code minecraft:classic}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Wolf.SoundVariant> CLASSIC = create(key("classic"));
+
+    /**
+     * {@code minecraft:cute}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Wolf.SoundVariant> CUTE = create(key("cute"));
+
+    /**
+     * {@code minecraft:grumpy}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Wolf.SoundVariant> GRUMPY = create(key("grumpy"));
+
+    /**
+     * {@code minecraft:puglin}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Wolf.SoundVariant> PUGLIN = create(key("puglin"));
+
+    /**
+     * {@code minecraft:sad}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Wolf.SoundVariant> SAD = create(key("sad"));
+
+    private WolfSoundVariantKeys() {
+    }
+
+    /**
+     * Creates a typed key for {@link Wolf.SoundVariant} in the registry {@code minecraft:wolf_sound_variant}.
+     *
+     * @param key the value's key in the registry
+     * @return a new typed key
+     */
+    public static TypedKey<Wolf.SoundVariant> create(final Key key) {
+        return TypedKey.create(RegistryKey.WOLF_SOUND_VARIANT, key);
+    }
+}

paper-api/src/generated/java/io/papermc/paper/registry/keys/WolfVariantKeys.java

@@ -7,7 +7,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.entity.Wolf;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -23,9 +22,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
-@ApiStatus.Experimental
+@GeneratedFrom("1.21.5")
 public final class WolfVariantKeys {
     /**
      * {@code minecraft:ashen}
@@ -94,12 +92,11 @@ public final class WolfVariantKeys {
     }
 
     /**
-     * Creates a key for {@link Wolf.Variant} in the registry {@code minecraft:wolf_variant}.
+     * Creates a typed key for {@link Wolf.Variant} in the registry {@code minecraft:wolf_variant}.
      *
      * @param key the value's key in the registry
      * @return a new typed key
      */
-    @ApiStatus.Experimental
     public static TypedKey<Wolf.Variant> create(final Key key) {
         return TypedKey.create(RegistryKey.WOLF_VARIANT, key);
     }

paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/BannerPatternTagKeys.java

@@ -11,7 +11,7 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
- * Vanilla keys for {@link RegistryKey#BANNER_PATTERN}.
+ * Vanilla tag keys for {@link RegistryKey#BANNER_PATTERN}.
  *
  * @apiNote The fields provided here are a direct representation of
  * what is available from the vanilla game source. They may be
@@ -23,8 +23,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
+@GeneratedFrom("1.21.5")
 @ApiStatus.Experimental
 public final class BannerPatternTagKeys {
     /**

paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/BiomeTagKeys.java

@@ -11,7 +11,7 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
- * Vanilla keys for {@link RegistryKey#BIOME}.
+ * Vanilla tag keys for {@link RegistryKey#BIOME}.
  *
  * @apiNote The fields provided here are a direct representation of
  * what is available from the vanilla game source. They may be
@@ -23,8 +23,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
+@GeneratedFrom("1.21.5")
 @ApiStatus.Experimental
 public final class BiomeTagKeys {
     /**
@@ -447,6 +447,13 @@ public final class BiomeTagKeys {
      */
     public static final TagKey<Biome> SNOW_GOLEM_MELTS = create(key("snow_golem_melts"));
 
+    /**
+     * {@code #minecraft:spawns_cold_variant_farm_animals}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> SPAWNS_COLD_VARIANT_FARM_ANIMALS = create(key("spawns_cold_variant_farm_animals"));
+
     /**
      * {@code #minecraft:spawns_cold_variant_frogs}
      *
@@ -468,6 +475,13 @@ public final class BiomeTagKeys {
      */
     public static final TagKey<Biome> SPAWNS_SNOW_FOXES = create(key("spawns_snow_foxes"));
 
+    /**
+     * {@code #minecraft:spawns_warm_variant_farm_animals}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> SPAWNS_WARM_VARIANT_FARM_ANIMALS = create(key("spawns_warm_variant_farm_animals"));
+
     /**
      * {@code #minecraft:spawns_warm_variant_frogs}
      *

paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/BlockTypeTagKeys.java

@@ -11,7 +11,7 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
- * Vanilla keys for {@link RegistryKey#BLOCK}.
+ * Vanilla tag keys for {@link RegistryKey#BLOCK}.
  *
  * @apiNote The fields provided here are a direct representation of
  * what is available from the vanilla game source. They may be
@@ -23,8 +23,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
+@GeneratedFrom("1.21.5")
 @ApiStatus.Experimental
 public final class BlockTypeTagKeys {
     /**
@@ -223,6 +223,13 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> CAMEL_SAND_STEP_SOUND_BLOCKS = create(key("camel_sand_step_sound_blocks"));
 
+    /**
+     * {@code #minecraft:camels_spawnable_on}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> CAMELS_SPAWNABLE_ON = create(key("camels_spawnable_on"));
+
     /**
      * {@code #minecraft:campfires}
      *
@@ -377,13 +384,6 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> DARK_OAK_LOGS = create(key("dark_oak_logs"));
 
-    /**
-     * {@code #minecraft:dead_bush_may_place_on}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TagKey<BlockType> DEAD_BUSH_MAY_PLACE_ON = create(key("dead_bush_may_place_on"));
-
     /**
      * {@code #minecraft:deepslate_ore_replaceables}
      *
@@ -440,6 +440,20 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> DRIPSTONE_REPLACEABLE_BLOCKS = create(key("dripstone_replaceable_blocks"));
 
+    /**
+     * {@code #minecraft:dry_vegetation_may_place_on}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> DRY_VEGETATION_MAY_PLACE_ON = create(key("dry_vegetation_may_place_on"));
+
+    /**
+     * {@code #minecraft:edible_for_sheep}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> EDIBLE_FOR_SHEEP = create(key("edible_for_sheep"));
+
     /**
      * {@code #minecraft:emerald_ores}
      *
@@ -895,6 +909,13 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> PLANKS = create(key("planks"));
 
+    /**
+     * {@code #minecraft:plays_ambient_desert_block_sounds}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> PLAYS_AMBIENT_DESERT_BLOCK_SOUNDS = create(key("plays_ambient_desert_block_sounds"));
+
     /**
      * {@code #minecraft:polar_bears_spawnable_on_alternate}
      *
@@ -951,6 +972,13 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> REPLACEABLE = create(key("replaceable"));
 
+    /**
+     * {@code #minecraft:replaceable_by_mushrooms}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> REPLACEABLE_BY_MUSHROOMS = create(key("replaceable_by_mushrooms"));
+
     /**
      * {@code #minecraft:replaceable_by_trees}
      *
@@ -1147,6 +1175,13 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> SWORD_EFFICIENT = create(key("sword_efficient"));
 
+    /**
+     * {@code #minecraft:sword_instantly_mines}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> SWORD_INSTANTLY_MINES = create(key("sword_instantly_mines"));
+
     /**
      * {@code #minecraft:terracotta}
      *

paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/DamageTypeTagKeys.java

@@ -11,7 +11,7 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
- * Vanilla keys for {@link RegistryKey#DAMAGE_TYPE}.
+ * Vanilla tag keys for {@link RegistryKey#DAMAGE_TYPE}.
  *
  * @apiNote The fields provided here are a direct representation of
  * what is available from the vanilla game source. They may be
@@ -23,8 +23,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
+@GeneratedFrom("1.21.5")
 @ApiStatus.Experimental
 public final class DamageTypeTagKeys {
     /**

paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/EnchantmentTagKeys.java

@@ -12,7 +12,7 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
- * Vanilla keys for {@link RegistryKey#ENCHANTMENT}.
+ * Vanilla tag keys for {@link RegistryKey#ENCHANTMENT}.
  *
  * @apiNote The fields provided here are a direct representation of
  * what is available from the vanilla game source. They may be
@@ -24,8 +24,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
+@GeneratedFrom("1.21.5")
 @ApiStatus.Experimental
 public final class EnchantmentTagKeys {
     /**

paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/EntityTypeTagKeys.java

@@ -11,7 +11,7 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
- * Vanilla keys for {@link RegistryKey#ENTITY_TYPE}.
+ * Vanilla tag keys for {@link RegistryKey#ENTITY_TYPE}.
  *
  * @apiNote The fields provided here are a direct representation of
  * what is available from the vanilla game source. They may be
@@ -23,8 +23,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
+@GeneratedFrom("1.21.5")
 @ApiStatus.Experimental
 public final class EntityTypeTagKeys {
     /**
@@ -83,6 +83,13 @@ public final class EntityTypeTagKeys {
      */
     public static final TagKey<EntityType> CAN_BREATHE_UNDER_WATER = create(key("can_breathe_under_water"));
 
+    /**
+     * {@code #minecraft:can_equip_saddle}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<EntityType> CAN_EQUIP_SADDLE = create(key("can_equip_saddle"));
+
     /**
      * {@code #minecraft:can_turn_in_boats}
      *
@@ -90,6 +97,13 @@ public final class EntityTypeTagKeys {
      */
     public static final TagKey<EntityType> CAN_TURN_IN_BOATS = create(key("can_turn_in_boats"));
 
+    /**
+     * {@code #minecraft:can_wear_horse_armor}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<EntityType> CAN_WEAR_HORSE_ARMOR = create(key("can_wear_horse_armor"));
+
     /**
      * {@code #minecraft:deflects_projectiles}
      *

paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/FluidTagKeys.java

@@ -11,7 +11,7 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
- * Vanilla keys for {@link RegistryKey#FLUID}.
+ * Vanilla tag keys for {@link RegistryKey#FLUID}.
  *
  * @apiNote The fields provided here are a direct representation of
  * what is available from the vanilla game source. They may be
@@ -23,8 +23,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
+@GeneratedFrom("1.21.5")
 @ApiStatus.Experimental
 public final class FluidTagKeys {
     /**

paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/GameEventTagKeys.java

@@ -11,7 +11,7 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
- * Vanilla keys for {@link RegistryKey#GAME_EVENT}.
+ * Vanilla tag keys for {@link RegistryKey#GAME_EVENT}.
  *
  * @apiNote The fields provided here are a direct representation of
  * what is available from the vanilla game source. They may be
@@ -23,8 +23,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
+@GeneratedFrom("1.21.5")
 @ApiStatus.Experimental
 public final class GameEventTagKeys {
     /**

paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/InstrumentTagKeys.java

@@ -11,7 +11,7 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
- * Vanilla keys for {@link RegistryKey#INSTRUMENT}.
+ * Vanilla tag keys for {@link RegistryKey#INSTRUMENT}.
  *
  * @apiNote The fields provided here are a direct representation of
  * what is available from the vanilla game source. They may be
@@ -23,8 +23,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
+@GeneratedFrom("1.21.5")
 @ApiStatus.Experimental
 public final class InstrumentTagKeys {
     /**

paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/ItemTypeTagKeys.java

@@ -11,7 +11,7 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
- * Vanilla keys for {@link RegistryKey#ITEM}.
+ * Vanilla tag keys for {@link RegistryKey#ITEM}.
  *
  * @apiNote The fields provided here are a direct representation of
  * what is available from the vanilla game source. They may be
@@ -23,8 +23,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
+@GeneratedFrom("1.21.5")
 @ApiStatus.Experimental
 public final class ItemTypeTagKeys {
     /**
@@ -118,6 +118,13 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> BOATS = create(key("boats"));
 
+    /**
+     * {@code #minecraft:book_cloning_target}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> BOOK_CLONING_TARGET = create(key("book_cloning_target"));
+
     /**
      * {@code #minecraft:bookshelf_books}
      *
@@ -349,6 +356,13 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> DYEABLE = create(key("dyeable"));
 
+    /**
+     * {@code #minecraft:eggs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> EGGS = create(key("eggs"));
+
     /**
      * {@code #minecraft:emerald_ores}
      *
@@ -510,6 +524,13 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> FISHES = create(key("fishes"));
 
+    /**
+     * {@code #minecraft:flowers}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> FLOWERS = create(key("flowers"));
+
     /**
      * {@code #minecraft:foot_armor}
      *

paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/PaintingVariantTagKeys.java

@@ -11,7 +11,7 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
- * Vanilla keys for {@link RegistryKey#PAINTING_VARIANT}.
+ * Vanilla tag keys for {@link RegistryKey#PAINTING_VARIANT}.
  *
  * @apiNote The fields provided here are a direct representation of
  * what is available from the vanilla game source. They may be
@@ -23,8 +23,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
+@GeneratedFrom("1.21.5")
 @ApiStatus.Experimental
 public final class PaintingVariantTagKeys {
     /**

paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/StructureTagKeys.java

@@ -6,13 +6,12 @@ import io.papermc.paper.generated.GeneratedFrom;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.tag.TagKey;
 import net.kyori.adventure.key.Key;
-import org.bukkit.MinecraftExperimental;
 import org.bukkit.generator.structure.Structure;
 import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
- * Vanilla keys for {@link RegistryKey#STRUCTURE}.
+ * Vanilla tag keys for {@link RegistryKey#STRUCTURE}.
  *
  * @apiNote The fields provided here are a direct representation of
  * what is available from the vanilla game source. They may be
@@ -24,8 +23,8 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
-@GeneratedFrom("1.21.4")
 @NullMarked
+@GeneratedFrom("1.21.5")
 @ApiStatus.Experimental
 public final class StructureTagKeys {
     /**
@@ -75,8 +74,6 @@ public final class StructureTagKeys {
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    @ApiStatus.Experimental
-    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
     public static final TagKey<Structure> ON_DESERT_VILLAGE_MAPS = create(key("on_desert_village_maps"));
 
     /**
@@ -84,8 +81,6 @@ public final class StructureTagKeys {
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    @ApiStatus.Experimental
-    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
     public static final TagKey<Structure> ON_JUNGLE_EXPLORER_MAPS = create(key("on_jungle_explorer_maps"));
 
     /**
@@ -100,8 +95,6 @@ public final class StructureTagKeys {
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    @ApiStatus.Experimental
-    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
     public static final TagKey<Structure> ON_PLAINS_VILLAGE_MAPS = create(key("on_plains_village_maps"));
 
     /**
@@ -109,8 +102,6 @@ public final class StructureTagKeys {
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    @ApiStatus.Experimental
-    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
     public static final TagKey<Structure> ON_SAVANNA_VILLAGE_MAPS = create(key("on_savanna_village_maps"));
 
     /**
@@ -118,8 +109,6 @@ public final class StructureTagKeys {
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    @ApiStatus.Experimental
-    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
     public static final TagKey<Structure> ON_SNOWY_VILLAGE_MAPS = create(key("on_snowy_village_maps"));
 
     /**
@@ -127,8 +116,6 @@ public final class StructureTagKeys {
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    @ApiStatus.Experimental
-    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
     public static final TagKey<Structure> ON_SWAMP_EXPLORER_MAPS = create(key("on_swamp_explorer_maps"));
 
     /**
@@ -136,8 +123,6 @@ public final class StructureTagKeys {
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    @ApiStatus.Experimental
-    @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
     public static final TagKey<Structure> ON_TAIGA_VILLAGE_MAPS = create(key("on_taiga_village_maps"));
 
     /**

paper-api/src/main/java/co/aikar/timings/TimingHistory.java

@@ -289,7 +289,7 @@ public class TimingHistory {
         final TicksRecord ticksRecord = new TicksRecord();
         final PingRecord pingRecord = new PingRecord();
         final TimingData fst = TimingsManager.FULL_SERVER_TICK.minuteData.clone();
-        final double tps = 1E9 / ( System.nanoTime() - lastMinuteTime ) * ticksRecord.timed;
+        final double tps = 1E9 / (System.nanoTime() - lastMinuteTime) * ticksRecord.timed;
         final double usedMemory = TimingsManager.FULL_SERVER_TICK.avgUsedMemory;
         final double freeMemory = TimingsManager.FULL_SERVER_TICK.avgFreeMemory;
         final double loadAvg = ManagementFactory.getOperatingSystemMXBean().getSystemLoadAverage();

paper-api/src/main/java/co/aikar/timings/TimingsManager.java

@@ -153,9 +153,9 @@ public final class TimingsManager {
     public static Timing getCommandTiming(@Nullable String pluginName, @NotNull Command command) {
         Plugin plugin = null;
         final Server server = Bukkit.getServer();
-        if (!(  server == null || pluginName == null ||
+        if (!(server == null || pluginName == null ||
-                "minecraft".equals(pluginName) || "bukkit".equals(pluginName) ||
+            "minecraft".equals(pluginName) || "bukkit".equals(pluginName) ||
-                "spigot".equalsIgnoreCase(pluginName) || "paper".equals(pluginName)
+            "spigot".equalsIgnoreCase(pluginName) || "paper".equals(pluginName)
         )) {
             plugin = server.getPluginManager().getPlugin(pluginName);
         }

paper-api/src/main/java/co/aikar/util/JSONUtil.java

@@ -5,10 +5,7 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
 
-import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;

paper-api/src/main/java/com/destroystokyo/paper/NamespacedTag.java

@@ -5,6 +5,7 @@ import java.util.Locale;
 import java.util.UUID;
 import java.util.regex.Pattern;
 import org.bukkit.plugin.Plugin;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -31,10 +32,10 @@ public final class NamespacedTag implements com.destroystokyo.paper.Namespaced {
      * compatibility measures.
      */
     public static final String BUKKIT = "bukkit";
-    //
+
     private static final Pattern VALID_NAMESPACE = Pattern.compile("[a-z0-9._-]+");
     private static final Pattern VALID_KEY = Pattern.compile("[a-z0-9/._-]+");
-    //
+
     private final String namespace;
     private final String key;
 
@@ -126,6 +127,7 @@ public final class NamespacedTag implements com.destroystokyo.paper.Namespaced {
      * @deprecated should never be used by plugins, for internal use only!!
      */
     @Deprecated
+    @ApiStatus.Internal
     public static NamespacedTag randomKey() {
         return new NamespacedTag(BUKKIT, UUID.randomUUID().toString());
     }

paper-api/src/main/java/com/destroystokyo/paper/entity/ai/GoalKey.java

@@ -1,6 +1,6 @@
 package com.destroystokyo.paper.entity.ai;
 
-import com.google.common.base.Objects;
+import java.util.Objects;
 import java.util.StringJoiner;
 import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Mob;
@@ -36,13 +36,13 @@ public final class GoalKey<T extends Mob> {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
         GoalKey<?> goalKey = (GoalKey<?>) o;
-        return Objects.equal(this.entityClass, goalKey.entityClass) &&
+        return Objects.equals(this.entityClass, goalKey.entityClass) &&
-            Objects.equal(this.namespacedKey, goalKey.namespacedKey);
+            Objects.equals(this.namespacedKey, goalKey.namespacedKey);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hashCode(this.entityClass, this.namespacedKey);
+        return Objects.hash(this.entityClass, this.namespacedKey);
     }
 
     @Override

paper-api/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java

@@ -24,8 +24,8 @@ public class BeaconEffectEvent extends BlockEvent implements Cancellable {
     private boolean cancelled;
 
     @ApiStatus.Internal
-    public BeaconEffectEvent(final Block block, final PotionEffect effect, final Player player, final boolean primary) {
+    public BeaconEffectEvent(final Block beacon, final PotionEffect effect, final Player player, final boolean primary) {
-        super(block);
+        super(beacon);
         this.effect = effect;
         this.player = player;
         this.primary = primary;

paper-api/src/main/java/com/destroystokyo/paper/event/block/BlockDestroyEvent.java

@@ -11,7 +11,7 @@ import org.jspecify.annotations.NullMarked;
 /**
  * Fired anytime the server intends to 'destroy' a block through some triggering reason.
  * This does not fire anytime a block is set to air, but only with more direct triggers such
- * as physics updates, pistons, Entities changing blocks, commands set to "Destroy".
+ * as physics updates, pistons, entities changing blocks, commands set to "Destroy".
  * <p>
  * This event is associated with the game playing a sound effect at the block in question, when
  * something can be described as "intend to destroy what is there",
@@ -39,7 +39,7 @@ public class BlockDestroyEvent extends BlockExpEvent implements Cancellable {
     }
 
     /**
-     * Get the effect that will be played when the block is broken.
+     * Gets the effect that will be played when the block is broken.
      *
      * @return block break effect
      */

paper-api/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java

@@ -33,8 +33,8 @@ public class TNTPrimeEvent extends BlockEvent implements Cancellable {
     private boolean cancelled;
 
     @ApiStatus.Internal
-    public TNTPrimeEvent(@NotNull Block theBlock, @NotNull PrimeReason reason, @Nullable Entity primerEntity) {
+    public TNTPrimeEvent(@NotNull Block block, @NotNull PrimeReason reason, @Nullable Entity primerEntity) {
-        super(theBlock);
+        super(block);
         this.reason = reason;
         this.primerEntity = primerEntity;
     }

paper-api/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java

@@ -1,6 +1,5 @@
 package com.destroystokyo.paper.event.entity;
 
-import com.google.common.collect.ImmutableList;
 import java.util.List;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.SkeletonHorse;
@@ -21,12 +20,6 @@ public class SkeletonHorseTrapEvent extends EntityEvent implements Cancellable {
     private final List<HumanEntity> eligibleHumans;
     private boolean cancelled;
 
-    @Deprecated
-    @ApiStatus.Internal
-    public SkeletonHorseTrapEvent(final SkeletonHorse horse) {
-        this(horse, ImmutableList.of());
-    }
-
     @ApiStatus.Internal
     public SkeletonHorseTrapEvent(final SkeletonHorse horse, final List<HumanEntity> eligibleHumans) {
         super(horse);

paper-api/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java

@@ -10,7 +10,7 @@ import org.jetbrains.annotations.Nullable;
 /**
  * @deprecated Not used
  */
-@Deprecated(since = "1.16.4")
+@Deprecated(since = "1.16.4", forRemoval = true)
 public class IllegalPacketEvent extends PlayerEvent {
 
     private static final HandlerList HANDLER_LIST = new HandlerList();

paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerArmorChangeEvent.java

@@ -5,6 +5,7 @@ import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.player.PlayerEvent;
+import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
@@ -16,8 +17,10 @@ import static org.bukkit.Material.*;
  * Called when the player themselves change their armor items
  * <p>
  * Not currently called for environmental factors though it <strong>MAY BE IN THE FUTURE</strong>
+ * @apiNote Use {@link io.papermc.paper.event.entity.EntityEquipmentChangedEvent} for all entity equipment changes
  */
 @NullMarked
+@ApiStatus.Obsolete(since = "1.21.4")
 public class PlayerArmorChangeEvent extends PlayerEvent {
 
     private static final HandlerList HANDLER_LIST = new HandlerList();
@@ -38,11 +41,27 @@ public class PlayerArmorChangeEvent extends PlayerEvent {
      * Gets the type of slot being altered.
      *
      * @return type of slot being altered
+     * @deprecated {@link SlotType} does not accurately represent what item types are valid in each slot. Use {@link #getSlot()} instead.
      */
+    @Deprecated(since = "1.21.4")
     public SlotType getSlotType() {
         return this.slotType;
     }
 
+    /**
+     * Gets the slot being altered.
+     *
+     * @return slot being altered
+     */
+    public EquipmentSlot getSlot() {
+        return switch (this.slotType) {
+            case HEAD -> EquipmentSlot.HEAD;
+            case CHEST -> EquipmentSlot.CHEST;
+            case LEGS -> EquipmentSlot.LEGS;
+            case FEET -> EquipmentSlot.FEET;
+        };
+    }
+
     /**
      * Gets the existing item that's being replaced
      *
@@ -70,6 +89,10 @@ public class PlayerArmorChangeEvent extends PlayerEvent {
         return HANDLER_LIST;
     }
 
+    /**
+     * @deprecated {@link SlotType} does not accurately represent what item types are valid in each slot.
+     */
+    @Deprecated(since = "1.21.4")
     public enum SlotType {
         HEAD(NETHERITE_HELMET, DIAMOND_HELMET, GOLDEN_HELMET, IRON_HELMET, CHAINMAIL_HELMET, LEATHER_HELMET, CARVED_PUMPKIN, PLAYER_HEAD, SKELETON_SKULL, ZOMBIE_HEAD, CREEPER_HEAD, WITHER_SKELETON_SKULL, TURTLE_HELMET, DRAGON_HEAD, PIGLIN_HEAD),
         CHEST(NETHERITE_CHESTPLATE, DIAMOND_CHESTPLATE, GOLDEN_CHESTPLATE, IRON_CHESTPLATE, CHAINMAIL_CHESTPLATE, LEATHER_CHESTPLATE, ELYTRA),

paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerClientOptionsChangeEvent.java

@@ -30,20 +30,6 @@ public class PlayerClientOptionsChangeEvent extends PlayerEvent {
     private final boolean textFilteringEnabled;
     private final ParticleVisibility particleVisibility;
 
-    @Deprecated
-    public PlayerClientOptionsChangeEvent(final Player player, final String locale, final int viewDistance, final ChatVisibility chatVisibility, final boolean chatColors, final SkinParts skinParts, final MainHand mainHand) {
-        super(player);
-        this.locale = locale;
-        this.viewDistance = viewDistance;
-        this.chatVisibility = chatVisibility;
-        this.chatColors = chatColors;
-        this.skinparts = skinParts;
-        this.mainHand = mainHand;
-        this.allowsServerListings = false;
-        this.textFilteringEnabled = false;
-        this.particleVisibility = ParticleVisibility.ALL;
-    }
-
     @ApiStatus.Internal
     public PlayerClientOptionsChangeEvent(final Player player, final Map<ClientOption<?>, ?> options) {
         super(player);

paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java

@@ -50,32 +50,6 @@ public class PlayerHandshakeEvent extends Event implements Cancellable {
         this.cancelled = cancelled;
     }
 
-    /**
-     * Determines if this event is cancelled.
-     * <p>
-     * When this event is cancelled, custom handshake logic will not
-     * be processed.
-     *
-     * @return {@code true} if this event is cancelled, {@code false} otherwise
-     */
-    @Override
-    public boolean isCancelled() {
-        return this.cancelled;
-    }
-
-    /**
-     * Sets if this event is cancelled.
-     * <p>
-     * When this event is cancelled, custom handshake logic will not
-     * be processed.
-     *
-     * @param cancel {@code true} if this event is cancelled, {@code false} otherwise
-     */
-    @Override
-    public void setCancelled(final boolean cancel) {
-        this.cancelled = cancel;
-    }
-
     /**
      * Gets the original handshake string.
      *
@@ -246,6 +220,32 @@ public class PlayerHandshakeEvent extends Event implements Cancellable {
         this.failMessage(LegacyComponentSerializer.legacySection().deserialize(failMessage));
     }
 
+    /**
+     * Determines if this event is cancelled.
+     * <p>
+     * When this event is cancelled, custom handshake logic will not
+     * be processed.
+     *
+     * @return {@code true} if this event is cancelled, {@code false} otherwise
+     */
+    @Override
+    public boolean isCancelled() {
+        return this.cancelled;
+    }
+
+    /**
+     * Sets if this event is cancelled.
+     * <p>
+     * When this event is cancelled, custom handshake logic will not
+     * be processed.
+     *
+     * @param cancel {@code true} if this event is cancelled, {@code false} otherwise
+     */
+    @Override
+    public void setCancelled(final boolean cancel) {
+        this.cancelled = cancel;
+    }
+
     @Override
     public HandlerList getHandlers() {
         return HANDLER_LIST;

paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java

@@ -37,7 +37,7 @@ public class PlayerJumpEvent extends PlayerEvent implements Cancellable {
     /**
      * {@inheritDoc}
      * <p>
-     * If a jump event is cancelled, the player will be moved or
+     * If this event is cancelled, the player will be moved or
      * teleported back to the Location as defined by {@link #getFrom()}. This will not
      * fire an event
      *
@@ -51,7 +51,7 @@ public class PlayerJumpEvent extends PlayerEvent implements Cancellable {
     /**
      * {@inheritDoc}
      * <p>
-     * If a jump event is cancelled, the player will be moved or
+     * If this event is cancelled, the player will be moved or
      * teleported back to the Location as defined by {@link #getFrom()}. This will not
      * fire an event
      *

paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerSetSpawnEvent.java

@@ -109,7 +109,7 @@ public class PlayerSetSpawnEvent extends PlayerEvent implements Cancellable {
 
     /**
      * Gets the notification message that will be sent to the player
-     * if {@link #willNotifyPlayer()} returns true.
+     * if {@link #willNotifyPlayer()} returns {@code true}.
      *
      * @return {@code null} if no notification
      */

paper-api/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java

@@ -11,7 +11,7 @@ import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 /**
- * Represents an event that is called when a player right-clicks an unknown entity.
+ * Represents an event that is called when a player clicks an unknown entity.
  * Useful for plugins dealing with virtual entities (entities that aren't actually spawned on the server).
  * <br>
  * This event may be called multiple times per interaction with different interaction hands

paper-api/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java

@@ -50,12 +50,6 @@ public class ProfileWhitelistVerifyEvent extends Event {
     private boolean whitelisted;
     private @Nullable Component kickMessage;
 
-    @Deprecated
-    @ApiStatus.Internal
-    public ProfileWhitelistVerifyEvent(final PlayerProfile profile, final boolean whitelistEnabled, final boolean whitelisted, final boolean isOp, final @Nullable String kickMessage) {
-        this(profile, whitelistEnabled, whitelisted, isOp, kickMessage == null ? null : LegacyComponentSerializer.legacySection().deserialize(kickMessage));
-    }
-
     @ApiStatus.Internal
     public ProfileWhitelistVerifyEvent(final PlayerProfile profile, final boolean whitelistEnabled, final boolean whitelisted, final boolean isOp, final @Nullable Component kickMessage) {
         this.profile = profile;

paper-api/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java

@@ -55,18 +55,6 @@ public class PaperServerListPingEvent extends ServerListPingEvent implements Can
     private boolean originalPlayerCount = true;
     private Object[] players;
 
-    @Deprecated
-    @ApiStatus.Internal
-    public PaperServerListPingEvent(@NotNull StatusClient client, @NotNull String motd, int numPlayers, int maxPlayers,
-            @NotNull String version, int protocolVersion, @Nullable CachedServerIcon favicon) {
-        super("", client.getAddress().getAddress(), motd, numPlayers, maxPlayers);
-        this.client = client;
-        this.numPlayers = numPlayers;
-        this.version = version;
-        this.protocolVersion = protocolVersion;
-        setServerIcon(favicon);
-    }
-
     @ApiStatus.Internal
     public PaperServerListPingEvent(@NotNull StatusClient client, @NotNull net.kyori.adventure.text.Component motd, int numPlayers, int maxPlayers,
                                     @NotNull String version, int protocolVersion, @Nullable CachedServerIcon favicon) {

paper-api/src/main/java/com/destroystokyo/paper/network/NetworkClient.java

@@ -21,7 +21,7 @@ public interface NetworkClient {
      * Returns the protocol version of the client.
      *
      * @return The client's protocol version, or {@code -1} if unknown
-     * @see <a href="http://wiki.vg/Protocol_version_numbers">List of protocol
+     * @see <a href="https://minecraft.wiki/w/Minecraft_Wiki:Projects/wiki.vg_merge/Protocol_version_numbers">List of protocol
      *     version numbers</a>
      */
     int getProtocolVersion();

paper-api/src/main/java/io/papermc/paper/InternalAPIBridge.java

@@ -1,6 +1,7 @@
 package io.papermc.paper;
 
 import net.kyori.adventure.util.Services;
+import org.bukkit.block.Biome;
 import org.bukkit.damage.DamageEffect;
 import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
@@ -35,5 +36,14 @@ public interface InternalAPIBridge {
      * @return the damage effect.
      */
     DamageEffect getDamageEffect(String key);
+
+    /**
+     * Constructs the legacy custom biome instance for the biome enum.
+     *
+     * @return the created biome.
+     */
+    @Deprecated(forRemoval = true, since = "1.21.5")
+    @ApiStatus.ScheduledForRemoval(inVersion = "1.22")
+    Biome constructLegacyCustomBiome();
 }
 

paper-api/src/main/java/io/papermc/paper/block/LockableTileState.java

@@ -5,7 +5,7 @@ import org.bukkit.block.Lockable;
 import org.bukkit.block.TileState;
 
 /**
- * Interface for tile entities that are lockable.
+ * Interface for block entities that are lockable.
  */
 public interface LockableTileState extends TileState, Lockable, Nameable {
 }

paper-api/src/main/java/io/papermc/paper/brigadier/PaperBrigadier.java

@@ -9,6 +9,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Helper methods to bridge the gaps between Brigadier and Paper-MojangAPI.
+ *
  * @deprecated for removal. See {@link MessageComponentSerializer} for a direct replacement of functionality found in
  * this class.
  * As a general entrypoint to brigadier on paper, see {@link io.papermc.paper.command.brigadier.Commands}.

paper-api/src/main/java/io/papermc/paper/command/brigadier/CommandRegistrationFlag.java

@@ -10,5 +10,10 @@ import org.jetbrains.annotations.ApiStatus;
  */
 @ApiStatus.Internal
 public enum CommandRegistrationFlag {
+
+    /**
+     * @deprecated This is the default behavior now.
+     */
+    @Deprecated(since = "1.21.4")
     FLATTEN_ALIASES
 }

paper-api/src/main/java/io/papermc/paper/command/brigadier/CommandSourceStack.java

@@ -1,5 +1,7 @@
 package io.papermc.paper.command.brigadier;
 
+import com.mojang.brigadier.RedirectModifier;
+import com.mojang.brigadier.tree.CommandNode;
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Entity;
@@ -48,4 +50,24 @@ public interface CommandSourceStack {
      * @return entity that executes this command
      */
     @Nullable Entity getExecutor();
+
+    /**
+     * Creates a new CommandSourceStack object with a different location for redirecting commands to other nodes.
+     *
+     * @param location The location to create a new CommandSourceStack object with
+     * @return The newly created CommandSourceStack
+     * @see #getLocation()
+     * @see com.mojang.brigadier.builder.ArgumentBuilder#fork(CommandNode, RedirectModifier)
+     */
+    CommandSourceStack withLocation(Location location);
+
+    /**
+     * Creates a new CommandSourceStack object with a different executor for redirecting commands to other nodes.
+     *
+     * @param executor The executing entity to create a new CommandSourceStack object with
+     * @return The newly created CommandSourceStack
+     * @see #getExecutor()
+     * @see com.mojang.brigadier.builder.ArgumentBuilder#fork(CommandNode, RedirectModifier)
+     */
+    CommandSourceStack withExecutor(Entity executor);
 }

paper-api/src/main/java/io/papermc/paper/command/brigadier/Commands.java

@@ -113,6 +113,7 @@ public interface Commands extends Registrar {
      * <p>Commands have certain overriding behavior:
      * <ul>
      *   <li>Aliases will not override already existing commands (excluding namespaced ones)</li>
+     *   <li>Aliases are <b>not</b> Brigadier redirects, they just copy the command to a different label</li>
      *   <li>The main command/namespaced label will override already existing commands</li>
      * </ul>
      *
@@ -129,6 +130,7 @@ public interface Commands extends Registrar {
      * <p>Commands have certain overriding behavior:
      * <ul>
      *   <li>Aliases will not override already existing commands (excluding namespaced ones)</li>
+     *   <li>Aliases are <b>not</b> Brigadier redirects, they just copy the command to a different label</li>
      *   <li>The main command/namespaced label will override already existing commands</li>
      * </ul>
      *
@@ -146,6 +148,7 @@ public interface Commands extends Registrar {
      * <p>Commands have certain overriding behavior:
      * <ul>
      *   <li>Aliases will not override already existing commands (excluding namespaced ones)</li>
+     *   <li>Aliases are <b>not</b> Brigadier redirects, they just copy the command to a different label</li>
      *   <li>The main command/namespaced label will override already existing commands</li>
      * </ul>
      *
@@ -163,6 +166,7 @@ public interface Commands extends Registrar {
      * <p>Commands have certain overriding behavior:
      * <ul>
      *   <li>Aliases will not override already existing commands (excluding namespaced ones)</li>
+     *   <li>Aliases are <b>not</b> Brigadier redirects, they just copy the command to a different label</li>
      *   <li>The main command/namespaced label will override already existing commands</li>
      * </ul>
      *
@@ -179,6 +183,7 @@ public interface Commands extends Registrar {
      * <p>Commands have certain overriding behavior:
      * <ul>
      *   <li>Aliases will not override already existing commands (excluding namespaced ones)</li>
+     *   <li>Aliases are <b>not</b> Brigadier redirects, they just copy the command to a different label</li>
      *   <li>The main command/namespaced label will override already existing commands</li>
      * </ul>
      *

paper-api/src/main/java/io/papermc/paper/command/brigadier/argument/ArgumentTypes.java

@@ -7,6 +7,7 @@ import io.papermc.paper.command.brigadier.argument.range.IntegerRangeProvider;
 import io.papermc.paper.command.brigadier.argument.resolvers.BlockPositionResolver;
 import io.papermc.paper.command.brigadier.argument.resolvers.FinePositionResolver;
 import io.papermc.paper.command.brigadier.argument.resolvers.PlayerProfileListResolver;
+import io.papermc.paper.command.brigadier.argument.resolvers.RotationResolver;
 import io.papermc.paper.command.brigadier.argument.resolvers.selector.EntitySelectorArgumentResolver;
 import io.papermc.paper.command.brigadier.argument.resolvers.selector.PlayerSelectorArgumentResolver;
 import io.papermc.paper.entity.LookAnchor;
@@ -123,6 +124,15 @@ public final class ArgumentTypes {
         return provider().finePosition(centerIntegers);
     }
 
+    /**
+     * A rotation argument.
+     *
+     * @return rotation argument
+     */
+    public static ArgumentType<RotationResolver> rotation() {
+        return provider().rotation();
+    }
+
     /**
      * A blockstate argument which will provide rich parsing for specifying
      * the specific block variant and then the block entity NBT if applicable.

paper-api/src/main/java/io/papermc/paper/command/brigadier/argument/VanillaArgumentProvider.java

@@ -7,6 +7,7 @@ import io.papermc.paper.command.brigadier.argument.range.IntegerRangeProvider;
 import io.papermc.paper.command.brigadier.argument.resolvers.BlockPositionResolver;
 import io.papermc.paper.command.brigadier.argument.resolvers.FinePositionResolver;
 import io.papermc.paper.command.brigadier.argument.resolvers.PlayerProfileListResolver;
+import io.papermc.paper.command.brigadier.argument.resolvers.RotationResolver;
 import io.papermc.paper.command.brigadier.argument.resolvers.selector.EntitySelectorArgumentResolver;
 import io.papermc.paper.command.brigadier.argument.resolvers.selector.PlayerSelectorArgumentResolver;
 import io.papermc.paper.entity.LookAnchor;
@@ -57,6 +58,8 @@ interface VanillaArgumentProvider {
 
     ArgumentType<FinePositionResolver> finePosition(boolean centerIntegers);
 
+    ArgumentType<RotationResolver> rotation();
+
     ArgumentType<BlockState> blockState();
 
     ArgumentType<ItemStack> itemStack();

paper-api/src/main/java/io/papermc/paper/command/brigadier/argument/resolvers/RotationResolver.java

@@ -0,0 +1,16 @@
+package io.papermc.paper.command.brigadier.argument.resolvers;
+
+import io.papermc.paper.command.brigadier.CommandSourceStack;
+import io.papermc.paper.math.Rotation;
+import org.jetbrains.annotations.ApiStatus;
+
+/**
+ * An {@link ArgumentResolver} that's capable of resolving
+ * a rotation argument value using a {@link CommandSourceStack}.
+ *
+ * @see io.papermc.paper.command.brigadier.argument.ArgumentTypes#rotation()
+ */
+@ApiStatus.Experimental
+@ApiStatus.NonExtendable
+public interface RotationResolver extends ArgumentResolver<Rotation> {
+}

paper-api/src/main/java/io/papermc/paper/datacomponent/DataComponentHolder.java

@@ -0,0 +1,48 @@
+package io.papermc.paper.datacomponent;
+
+import org.bukkit.Utility;
+import org.bukkit.persistence.PersistentDataContainer;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * This represents an object capable of holding and mutating data components.
+ *
+ * @see PersistentDataContainer
+ */
+@NullMarked
+@ApiStatus.NonExtendable
+public interface DataComponentHolder extends DataComponentView {
+
+    /**
+     * Sets the value of the data component type for this holder.
+     *
+     * @param type the data component type
+     * @param valueBuilder value builder
+     * @param <T> value type
+     */
+    @Utility
+    @org.jetbrains.annotations.ApiStatus.Experimental
+    public <T> void setData(final io.papermc.paper.datacomponent.DataComponentType.@NotNull Valued<T> type, final @NotNull io.papermc.paper.datacomponent.DataComponentBuilder<T> valueBuilder);
+
+    /**
+     * Sets the value of the data component type for this holder.
+     *
+     * @param type the data component type
+     * @param value value to set
+     * @param <T> value type
+     */
+    @org.jetbrains.annotations.ApiStatus.Experimental
+    public <T> void setData(final io.papermc.paper.datacomponent.DataComponentType.@NotNull Valued<T> type, final @NotNull T value);
+
+    /**
+     * Marks this non-valued data component type as present in this itemstack.
+     *
+     * @param type the data component type
+     */
+    @org.jetbrains.annotations.ApiStatus.Experimental
+    public void setData(final io.papermc.paper.datacomponent.DataComponentType.@NotNull NonValued type);
+
+   // TODO: Do we even want to have the concept of overriding here? Not sure what is going on with entity components
+}

paper-api/src/main/java/io/papermc/paper/datacomponent/DataComponentTypes.java

@@ -2,6 +2,7 @@ package io.papermc.paper.datacomponent;
 
 import io.papermc.paper.datacomponent.item.BannerPatternLayers;
 import io.papermc.paper.datacomponent.item.BlockItemDataProperties;
+import io.papermc.paper.datacomponent.item.BlocksAttacks;
 import io.papermc.paper.datacomponent.item.BundleContents;
 import io.papermc.paper.datacomponent.item.ChargedProjectiles;
 import io.papermc.paper.datacomponent.item.Consumable;
@@ -32,21 +33,42 @@ import io.papermc.paper.datacomponent.item.ResolvableProfile;
 import io.papermc.paper.datacomponent.item.SeededContainerLoot;
 import io.papermc.paper.datacomponent.item.SuspiciousStewEffects;
 import io.papermc.paper.datacomponent.item.Tool;
-import io.papermc.paper.datacomponent.item.Unbreakable;
+import io.papermc.paper.datacomponent.item.TooltipDisplay;
 import io.papermc.paper.datacomponent.item.UseCooldown;
 import io.papermc.paper.datacomponent.item.UseRemainder;
+import io.papermc.paper.datacomponent.item.Weapon;
 import io.papermc.paper.datacomponent.item.WritableBookContent;
 import io.papermc.paper.datacomponent.item.WrittenBookContent;
 import io.papermc.paper.item.MapPostProcessing;
 import java.util.List;
+import io.papermc.paper.registry.tag.TagKey;
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.text.Component;
+import org.bukkit.Art;
 import org.bukkit.DyeColor;
 import org.bukkit.FireworkEffect;
 import org.bukkit.MusicInstrument;
 import org.bukkit.NamespacedKey;
 import org.bukkit.Registry;
+import org.bukkit.block.banner.PatternType;
+import org.bukkit.entity.Axolotl;
+import org.bukkit.entity.Cat;
+import org.bukkit.entity.Chicken;
+import org.bukkit.entity.Cow;
+import org.bukkit.entity.Fox;
+import org.bukkit.entity.Frog;
+import org.bukkit.entity.Horse;
+import org.bukkit.entity.Llama;
+import org.bukkit.entity.MushroomCow;
+import org.bukkit.entity.Parrot;
+import org.bukkit.entity.Pig;
+import org.bukkit.entity.Rabbit;
+import org.bukkit.entity.Salmon;
+import org.bukkit.entity.TropicalFish;
+import org.bukkit.entity.Villager;
+import org.bukkit.entity.Wolf;
 import org.bukkit.inventory.ItemRarity;
+import org.bukkit.inventory.meta.trim.TrimMaterial;
 import org.checkerframework.checker.index.qual.NonNegative;
 import org.checkerframework.checker.index.qual.Positive;
 import org.checkerframework.common.value.qual.IntRange;
@@ -88,7 +110,7 @@ public final class DataComponentTypes {
     /**
      * If set, the item will not lose any durability when used.
      */
-    public static final DataComponentType.Valued<Unbreakable> UNBREAKABLE = valued("unbreakable");
+    public static final DataComponentType.NonValued UNBREAKABLE = unvalued("unbreakable");
     /**
      * Custom name override for an item (as set by renaming with an Anvil).
      *
@@ -144,15 +166,7 @@ public final class DataComponentTypes {
      * Controls the minecraft:custom_model_data property in the item model.
      */
     public static final DataComponentType.Valued<CustomModelData> CUSTOM_MODEL_DATA = valued("custom_model_data");
-    /**
+    public static final DataComponentType.Valued<TooltipDisplay> TOOLTIP_DISPLAY = valued("tooltip_display");
-     * If set, disables 'additional' tooltip part which comes from the item type
-     * (e.g. content of a shulker).
-     */
-    public static final DataComponentType.NonValued HIDE_ADDITIONAL_TOOLTIP = unvalued("hide_additional_tooltip");
-    /**
-     * If set, it will completely hide whole item tooltip (that includes item name).
-     */
-    public static final DataComponentType.NonValued HIDE_TOOLTIP = unvalued("hide_tooltip");
     /**
      * The additional experience cost required to modify an item in an Anvil.
      * If not present, has an implicit default value of: {@code 0}.
@@ -188,12 +202,14 @@ public final class DataComponentTypes {
      * Controls the behavior of the item as a tool.
      */
     public static final DataComponentType.Valued<Tool> TOOL = valued("tool");
+    public static final DataComponentType.Valued<Weapon> WEAPON = valued("weapon");
     public static final DataComponentType.Valued<Enchantable> ENCHANTABLE = valued("enchantable");
     public static final DataComponentType.Valued<Equippable> EQUIPPABLE = valued("equippable");
     public static final DataComponentType.Valued<Repairable> REPAIRABLE = valued("repairable");
     public static final DataComponentType.NonValued GLIDER = unvalued("glider");
     public static final DataComponentType.Valued<Key> TOOLTIP_STYLE = valued("tooltip_style");
     public static final DataComponentType.Valued<DeathProtection> DEATH_PROTECTION = valued("death_protection");
+    public static final DataComponentType.Valued<BlocksAttacks> BLOCKS_ATTACKS = valued("blocks_attacks");
     /**
      * Stores list of enchantments and their levels for an Enchanted Book.
      * Unlike {@link #ENCHANTMENTS}, the effects provided by enchantments
@@ -243,6 +259,7 @@ public final class DataComponentTypes {
      * or potion applied to a Tipped Arrow.
      */
     public static final DataComponentType.Valued<PotionContents> POTION_CONTENTS = valued("potion_contents");
+    public static final DataComponentType.Valued<Float> POTION_DURATION_SCALE = valued("potion_duration_scale");
     /**
      * Holds the effects that will be applied when consuming Suspicious Stew.
      */
@@ -267,11 +284,14 @@ public final class DataComponentTypes {
      * Holds the instrument type used by a Goat Horn.
      */
     public static final DataComponentType.Valued<MusicInstrument> INSTRUMENT = valued("instrument");
+    // this is a either holder, but due to legacy item loading
+    public static final DataComponentType.Valued<TrimMaterial> PROVIDES_TRIM_MATERIAL = valued("provides_trim_material");
     /**
      * Controls the amplifier amount for an Ominous Bottle's Bad Omen effect.
      */
     public static final DataComponentType.Valued<OminousBottleAmplifier> OMINOUS_BOTTLE_AMPLIFIER = valued("ominous_bottle_amplifier");
     public static final DataComponentType.Valued<JukeboxPlayable> JUKEBOX_PLAYABLE = valued("jukebox_playable");
+    public static final DataComponentType.Valued<TagKey<PatternType>> PROVIDES_BANNER_PATTERNS = valued("provides_banner_patterns");
     /**
      * List of recipes that should be unlocked when using the Knowledge Book item.
      */
@@ -329,14 +349,50 @@ public final class DataComponentTypes {
      * Holds the unresolved loot table and seed of a container-like block.
      */
     public static final DataComponentType.Valued<SeededContainerLoot> CONTAINER_LOOT = valued("container_loot");
+    public static final DataComponentType.Valued<Key> BREAK_SOUND = valued("break_sound");
+    public static final DataComponentType.Valued<Villager.Type> VILLAGER_VARIANT = valued("villager/variant");
+    public static final DataComponentType.Valued<Wolf.Variant> WOLF_VARIANT = valued("wolf/variant");
+    public static final DataComponentType.Valued<Wolf.SoundVariant> WOLF_SOUND_VARIANT = valued("wolf/sound_variant");
+    public static final DataComponentType.Valued<DyeColor> WOLF_COLLAR = valued("wolf/collar");
+    public static final DataComponentType.Valued<Fox.Type> FOX_VARIANT = valued("fox/variant");
+    public static final DataComponentType.Valued<Salmon.Variant> SALMON_SIZE = valued("salmon/size");
+    public static final DataComponentType.Valued<Parrot.Variant> PARROT_VARIANT = valued("parrot/variant");
+    public static final DataComponentType.Valued<TropicalFish.Pattern> TROPICAL_FISH_PATTERN = valued("tropical_fish/pattern");
+    public static final DataComponentType.Valued<DyeColor> TROPICAL_FISH_BASE_COLOR = valued("tropical_fish/base_color");
+    public static final DataComponentType.Valued<DyeColor> TROPICAL_FISH_PATTERN_COLOR = valued("tropical_fish/pattern_color");
+    public static final DataComponentType.Valued<MushroomCow.Variant> MOOSHROOM_VARIANT = valued("mooshroom/variant");
+    public static final DataComponentType.Valued<Rabbit.Type> RABBIT_VARIANT = valued("rabbit/variant");
+    public static final DataComponentType.Valued<Pig.Variant> PIG_VARIANT = valued("pig/variant");
+    public static final DataComponentType.Valued<Cow.Variant> COW_VARIANT = valued("cow/variant");
+    // TODO: This is a eitherholder? Why specifically the chicken?? Oh wait this is prolly for chicken egg cause legacy item loading
+    public static final DataComponentType.Valued<Chicken.Variant> CHICKEN_VARIANT = valued("chicken/variant");
+    public static final DataComponentType.Valued<Frog.Variant> FROG_VARIANT = valued("frog/variant");
+    public static final DataComponentType.Valued<Horse.Style> HORSE_VARIANT = valued("horse/variant");
+    public static final DataComponentType.Valued<Art> PAINTING_VARIANT = valued("painting/variant");
+    public static final DataComponentType.Valued<Llama.Color> LLAMA_VARIANT = valued("llama/variant");
+    public static final DataComponentType.Valued<Axolotl.Variant> AXOLOTL_VARIANT = valued("axolotl/variant");
+    public static final DataComponentType.Valued<Cat.Type> CAT_VARIANT = valued("cat/variant");
+    public static final DataComponentType.Valued<DyeColor> CAT_COLLAR = valued("cat/collar");
+    public static final DataComponentType.Valued<DyeColor> SHEEP_COLOR = valued("sheep/color");
+    public static final DataComponentType.Valued<DyeColor> SHULKER_COLOR = valued("shulker/color");
+
 
     private static DataComponentType.NonValued unvalued(final String name) {
-        return (DataComponentType.NonValued) requireNonNull(Registry.DATA_COMPONENT_TYPE.get(NamespacedKey.minecraft(name)), name + " unvalued data component type couldn't be found, this is a bug.");
+        final DataComponentType dataComponentType = requireNonNull(Registry.DATA_COMPONENT_TYPE.get(NamespacedKey.minecraft(name)), name + " unvalued data component type couldn't be found, this is a bug.");
+        if (dataComponentType instanceof DataComponentType.NonValued) {
+            return (DataComponentType.NonValued) dataComponentType;
+        }
+        throw new IllegalStateException(name + " is not a valid unvalued type, it is a " + dataComponentType.getClass().getTypeName());
     }
 
     @SuppressWarnings("unchecked")
     private static <T> DataComponentType.Valued<T> valued(final String name) {
-        return (DataComponentType.Valued<T>) requireNonNull(Registry.DATA_COMPONENT_TYPE.get(NamespacedKey.minecraft(name)), name + " valued data component type couldn't be found, this is a bug.");
+        DataComponentType dataComponentType =  requireNonNull(Registry.DATA_COMPONENT_TYPE.get(NamespacedKey.minecraft(name)), name + " valued data component type couldn't be found, this is a bug.");
+        if (dataComponentType instanceof DataComponentType.Valued) {
+            return (DataComponentType.Valued<T>) dataComponentType;
+        }
+        throw new IllegalStateException(name + " is not a valid valued type, it is a " + dataComponentType.getClass().getTypeName());
+
     }
 
     private DataComponentTypes() {

paper-api/src/main/java/io/papermc/paper/datacomponent/DataComponentView.java

@@ -0,0 +1,65 @@
+package io.papermc.paper.datacomponent;
+
+import org.bukkit.Utility;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * This represents a view of a data component holder. No
+ * methods on this interface mutate the holder.
+ *
+ * @see DataComponentHolder
+ */
+@NullMarked
+@ApiStatus.NonExtendable
+public interface DataComponentView {
+    // Paper start - data component API
+    /**
+     * Gets the value for the data component type on this stack.
+     *
+     * @param type the data component type
+     * @param <T> the value type
+     * @return the value for the data component type, or {@code null} if not set or marked as removed
+     * @see #hasData(io.papermc.paper.datacomponent.DataComponentType) for DataComponentType.NonValued
+     */
+    @Contract(pure = true)
+    @ApiStatus.Experimental
+    public <T> @Nullable T getData(final DataComponentType.@NotNull Valued<T> type);
+
+    /**
+     * Gets the value for the data component type on this holder with
+     * a fallback value.
+     *
+     * @param type the data component type
+     * @param fallback the fallback value if the value isn't present
+     * @param <T> the value type
+     * @return the value for the data component type or the fallback value
+     */
+    @Utility
+    @Contract(value = "_, !null -> !null", pure = true)
+    @ApiStatus.Experimental
+    public <T> @Nullable T getDataOrDefault(final DataComponentType.@NotNull Valued<? extends T> type, final @Nullable T fallback);
+
+    /**
+     * Checks if the data component type is set on this holder.
+     *
+     * @param type the data component type
+     * @return {@code true} if set, {@code false} otherwise
+     */
+    @Contract(pure = true)
+    @ApiStatus.Experimental
+    boolean hasData(final io.papermc.paper.datacomponent.@NotNull DataComponentType type);
+
+    // Not applicable to entities
+    // /**
+    //  * Gets all the data component types set on this holder.
+    //  *
+    //  * @return an immutable set of data component types
+    //  */
+    // @Contract("-> new")
+    // @ApiStatus.Experimental
+    // java.util.@Unmodifiable Set<io.papermc.paper.datacomponent.@NotNull DataComponentType> getDataTypes();
+}

paper-api/src/main/java/io/papermc/paper/datacomponent/item/BlocksAttacks.java

@@ -0,0 +1,68 @@
+package io.papermc.paper.datacomponent.item;
+
+import io.papermc.paper.datacomponent.DataComponentBuilder;
+import io.papermc.paper.registry.tag.TagKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.damage.DamageType;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Contract;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
+
+// TODO
+@NullMarked
+@ApiStatus.Experimental
+@ApiStatus.NonExtendable
+public interface BlocksAttacks {
+
+    @Contract(value = "-> new", pure = true)
+    static Builder blocksAttacks() {
+        return ItemComponentTypesBridge.bridge().blocksAttacks();
+    }
+
+    float blockDelaySeconds();
+
+    float disableCooldownScale();
+
+    //List<DamageReduction> damageReductions();
+
+    //ItemDamageFunction itemDamage();
+
+    @Nullable TagKey<DamageType> bypassedBy();
+
+    @Nullable Key blockSound();
+
+    @Nullable Key disableSound();
+
+    /**
+     * Builder for {@link BlocksAttacks}.
+     */
+    @ApiStatus.Experimental
+    @ApiStatus.NonExtendable
+    interface Builder extends DataComponentBuilder<BlocksAttacks> {
+
+        @Contract(value = "_ -> this", mutates = "this")
+        Builder blockDelaySeconds(float delay);
+
+        @Contract(value = "_ -> this", mutates = "this")
+        Builder disableCooldownScale(float scale);
+
+        //@Contract(value = "_ -> this", mutates = "this")
+        //Builder addDamageReduction(DamageReduction reduction);
+
+        //@Contract(value = "_ -> this", mutates = "this")
+        //Builder damageReductions(List<DamageReduction> reductions);
+
+        //@Contract(value = "_ -> this", mutates = "this")
+        //Builder itemDamage(ItemDamageFunction function);
+
+        @Contract(value = "_ -> this", mutates = "this")
+        Builder bypassedBy(@Nullable TagKey<DamageType> bypassedBy);
+
+        @Contract(value = "_ -> this", mutates = "this")
+        Builder blockSound(@Nullable Key sound);
+
+        @Contract(value = "_ -> this", mutates = "this")
+        Builder disableSound(@Nullable Key sound);
+    }
+}

paper-api/src/main/java/io/papermc/paper/datacomponent/item/DamageResistant.java

@@ -21,9 +21,9 @@ public interface DamageResistant {
     }
 
     /**
-     * The types that this damage type is invincible tp.
+     * The types that this damage type is invincible to.
      *
-     * @return item
+     * @return the key of the tag holding the respective damage types.
      */
     @Contract(value = "-> new", pure = true)
     TagKey<DamageType> types();

paper-api/src/main/java/io/papermc/paper/datacomponent/item/DyedItemColor.java

@@ -13,11 +13,11 @@ import org.jspecify.annotations.NullMarked;
 @NullMarked
 @ApiStatus.Experimental
 @ApiStatus.NonExtendable
-public interface DyedItemColor extends ShownInTooltip<DyedItemColor> {
+public interface DyedItemColor {
 
     @Contract(value = "_, _ -> new", pure = true)
-    static DyedItemColor dyedItemColor(final Color color, final boolean showInTooltip) {
+    static DyedItemColor dyedItemColor(final Color color) {
-        return dyedItemColor().color(color).showInTooltip(showInTooltip).build();
+        return dyedItemColor().color(color).build();
     }
 
     @Contract(value = "-> new", pure = true)
@@ -38,7 +38,7 @@ public interface DyedItemColor extends ShownInTooltip<DyedItemColor> {
      */
     @ApiStatus.Experimental
     @ApiStatus.NonExtendable
-    interface Builder extends ShownInTooltip.Builder<Builder>, DataComponentBuilder<DyedItemColor> {
+    interface Builder extends DataComponentBuilder<DyedItemColor> {
 
         /**
          * Sets the color of this builder.

paper-api/src/main/java/io/papermc/paper/datacomponent/item/Equippable.java

@@ -96,6 +96,14 @@ public interface Equippable extends BuildableDataComponent<Equippable, Equippabl
     @Contract(pure = true)
     boolean damageOnHurt();
 
+    /**
+     * Checks if the item should be equipped when interacting with an entity.
+     *
+     * @return true if it equips on interact, false otherwise
+     */
+    @Contract(pure = true)
+    boolean equipOnInteract();
+
     /**
      * Builder for {@link Equippable}.
      */
@@ -165,5 +173,14 @@ public interface Equippable extends BuildableDataComponent<Equippable, Equippabl
          */
         @Contract(value = "_ -> this", mutates = "this")
         Builder damageOnHurt(boolean damageOnHurt);
+
+        /**
+         * Sets whether the item should be equipped when interacting with an entity.
+         *
+         * @param equipOnInteract true if it equips on interact
+         * @return the builder for chaining
+         */
+        @Contract(value = "_ -> this", mutates = "this")
+        Builder equipOnInteract(boolean equipOnInteract);
     }
 }

paper-api/src/main/java/io/papermc/paper/datacomponent/item/ItemAdventurePredicate.java

@@ -1,6 +1,7 @@
 package io.papermc.paper.datacomponent.item;
 
 import io.papermc.paper.block.BlockPredicate;
+import io.papermc.paper.datacomponent.BuildableDataComponent;
 import io.papermc.paper.datacomponent.DataComponentBuilder;
 import java.util.List;
 import org.jetbrains.annotations.ApiStatus;
@@ -16,7 +17,7 @@ import org.jspecify.annotations.NullMarked;
 @NullMarked
 @ApiStatus.Experimental
 @ApiStatus.NonExtendable
-public interface ItemAdventurePredicate extends ShownInTooltip<ItemAdventurePredicate> {
+public interface ItemAdventurePredicate {
 
     @Contract(value = "_ -> new", pure = true)
     static ItemAdventurePredicate itemAdventurePredicate(final List<BlockPredicate> predicates) {
@@ -41,7 +42,7 @@ public interface ItemAdventurePredicate extends ShownInTooltip<ItemAdventurePred
      */
     @ApiStatus.Experimental
     @ApiStatus.NonExtendable
-    interface Builder extends ShownInTooltip.Builder<Builder>, DataComponentBuilder<ItemAdventurePredicate> {
+    interface Builder extends DataComponentBuilder<ItemAdventurePredicate> {
         /**
          * Adds a block predicate to this builder.
          *

paper-api/src/main/java/io/papermc/paper/datacomponent/item/ItemArmorTrim.java

@@ -13,12 +13,7 @@ import org.jspecify.annotations.NullMarked;
 @NullMarked
 @ApiStatus.Experimental
 @ApiStatus.NonExtendable
-public interface ItemArmorTrim extends ShownInTooltip<ItemArmorTrim> {
+public interface ItemArmorTrim  {
-
-    @Contract(value = "_, _ -> new", pure = true)
-    static ItemArmorTrim itemArmorTrim(final ArmorTrim armorTrim, final boolean showInTooltip) {
-        return itemArmorTrim(armorTrim).showInTooltip(showInTooltip).build();
-    }
 
     @Contract(value = "_ -> new", pure = true)
     static ItemArmorTrim.Builder itemArmorTrim(final ArmorTrim armorTrim) {
@@ -38,7 +33,7 @@ public interface ItemArmorTrim extends ShownInTooltip<ItemArmorTrim> {
      */
     @ApiStatus.Experimental
     @ApiStatus.NonExtendable
-    interface Builder extends ShownInTooltip.Builder<Builder>, DataComponentBuilder<ItemArmorTrim> {
+    interface Builder extends DataComponentBuilder<ItemArmorTrim> {
 
         /**
          * Sets the armor trim for this builder.

paper-api/src/main/java/io/papermc/paper/datacomponent/item/ItemAttributeModifiers.java

@@ -17,7 +17,7 @@ import org.jspecify.annotations.NullMarked;
 @NullMarked
 @ApiStatus.Experimental
 @ApiStatus.NonExtendable
-public interface ItemAttributeModifiers extends ShownInTooltip<ItemAttributeModifiers> {
+public interface ItemAttributeModifiers {
 
     @Contract(value = "-> new", pure = true)
     static ItemAttributeModifiers.Builder itemAttributes() {
@@ -69,7 +69,7 @@ public interface ItemAttributeModifiers extends ShownInTooltip<ItemAttributeModi
      */
     @ApiStatus.Experimental
     @ApiStatus.NonExtendable
-    interface Builder extends ShownInTooltip.Builder<Builder>, DataComponentBuilder<ItemAttributeModifiers> {
+    interface Builder extends DataComponentBuilder<ItemAttributeModifiers> {
 
         /**
          * Adds a modifier to this builder.