Fix New Features

We are already using the dropped stack to determine the type, we
might as well also use it for the count, given that plugins can already
mutate the type, might as well let them mess with the amount.

.github/workflows/build.yml

@@ -19,18 +19,16 @@ jobs:
     # The goal of the build workflow is split into multiple requirements.
     # 1. Run on pushes to same repo.
     # 2. Run on PR open/reopen/syncs from repos that are not the same (PRs from the same repo are covered by 1)
-    # 3. Run on labeled PRs that have the build-pr-jar flag.
+    # 3. Run on labeled PRs that have the publish-pr flag.
     if: >
       (
         (github.event_name == 'push')
         || (github.event_name == 'pull_request' && github.repository != github.event.pull_request.head.repo.full_name && contains(fromJSON('["opened", "reopened", "synchronize"]'), github.event.action))
-        || (github.event_name == 'pull_request' && github.event.action == 'labeled' && github.event.label.name == 'build-pr-jar')
+        || (github.event_name == 'pull_request' && github.event.action == 'labeled' && github.event.label.name == 'publish-pr')
       )
 
     runs-on: ubuntu-latest
     strategy:
-      matrix:
-        java: [21]
       fail-fast: true
     steps:
       - if: ${{ github.event_name == 'push' }}
@@ -43,14 +41,17 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.sha }}
-      - name: JDK ${{ matrix.java }}
+      - name: JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: ${{ matrix.java }}
+          java-version: 21
           distribution: 'zulu'
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
+        with:
+          # Allow cache writes on main and dev branches
+          cache-read-only: ${{ github.ref != 'refs/heads/main' && !startsWith(github.ref, 'refs/heads/dev/') }}
 
       - name: Configure Build
         uses: actions/github-script@v7
@@ -73,14 +74,14 @@ jobs:
 
             if (event_name === "push" && ref_type === "branch") {
               const {data: pulls} = await github.rest.pulls.list({ owner, repo, head: `${owner}:${ref_name}`, state: "open" });
-              const pull = pulls.find((pr) => !!pr.labels.find((l) => l.name === "build-pr-jar"));
+              const pull = pulls.find((pr) => !!pr.labels.find((l) => l.name === "publish-pr"));
               if (pull) {
                 result["pr"] = pull.number;
                 result["action"] = "paperclip";
                 core.notice(`This is a push action but to a branch with an open PR with the build paperclip label (${JSON.stringify(result)})`);
                 return result;
               }
-            } else if (event_name === "pull_request" && event.pull_request.labels.find((l) => l.name === "build-pr-jar")) {
+            } else if (event_name === "pull_request" && event.pull_request.labels.find((l) => l.name === "publish-pr")) {
               result["pr"] = event.pull_request.number;
               result["action"] = "paperclip";
               core.notice(`This is a pull request action with a build paperclip label (${JSON.stringify(result)})`);
@@ -102,7 +103,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: Test Results (${{ matrix.java }})
+          name: Test Results
           path: |
             **/build/test-results/test/TEST-*.xml
 
@@ -116,6 +117,13 @@ jobs:
         with:
           name: paper-${{ fromJSON(steps.determine.outputs.result).pr }}
           path: paper-server/build/libs/paper-paperclip-*-mojmap.jar
+
+      - name: Publish Artifacts
+        if: fromJSON(steps.determine.outputs.result).action == 'paperclip'
+        uses: PaperMC/action-pr-publishing/upload@paper
+        with:
+          # TODO fallback for failing javadoc
+          publishing-task: ":paper-api:publishAllPublicationsTo_githubPackages_PRsRepository publishDevBundlePublicationTo_githubPackages_PRsRepository -PpublishDevBundle"
   event_file:
     name: "Event File"
     # Only run on PRs if the source branch is on someone else's repo

.github/workflows/pr_comment.yml

@@ -1,84 +0,0 @@
-# This workflow run on the completion of the
-# build workflow but only does anything if the
-# triggering workflow uploaded an artifact.
-#
-# Do note that it is then the trigger workflow that
-# determines if this will update the PR text body. All
-# this workflow does is check if an uploaded artifact
-# exists and there is a PR tied to the previous workflow.
-
-name: Comment on pull request
-on:
-  workflow_run:
-    workflows: ['Build Paper']
-    types: [completed]
-jobs:
-  pr_comment:
-    if: github.event.workflow_run.conclusion == 'success'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/github-script@v7
-        env:
-          BRANCH_NAME: "${{ github.event.workflow_run.head_branch }}"
-          PR_OWNER: "${{ github.event.workflow_run.head_repository.owner.login }}"
-          PR_SHA: "${{ github.event.workflow_run.head_sha }}"
-          RUN_ID: "${{ github.event.workflow_run.id }}"
-          REPO_ID: "${{ github.event.repository.id }}"
-          EVENT_TYPE: "${{ github.event.workflow_run.event}}"
-          PULL_REQUESTS: "${{ toJSON(github.event.workflow_run.pull_requests) }}"
-        with:
-          # This snippet is public-domain, taken from
-          # https://github.com/oprypin/nightly.link/blob/master/.github/workflows/pr-comment.yml
-          # Modified extensively by Machine_Maker
-          script: |
-            async function updatePR(owner, repo, issue_number, purpose, body) {
-              const { data } = await github.rest.issues.get({ owner, repo, issue_number });
-              core.debug(JSON.stringify(data, null, 2));
-
-              const marker = `<!-- bot: ${purpose} -->`;
-
-              let new_body = data.body ? data.body.trim().split(marker)[0].trim() : "";
-              new_body += `\n${marker}\n---\n${body}`;
-
-              core.info(`Updating the text body of PR #${issue_number} in ${owner}/${repo}`);
-              await github.rest.issues.update({ owner, repo, issue_number, body: new_body });
-            }
-
-            const { owner, repo } = context.repo;
-            const run_id = `${process.env.RUN_ID}`;
-            const repo_id = `${process.env.REPO_ID}`;
-
-            let pulls = [];
-            const event_type = `${process.env.EVENT_TYPE}`;
-            if (event_type === "push") { // if push, it's from the same repo which means `pull_requests` is populated
-              pulls = JSON.parse(`${process.env.PULL_REQUESTS}`);
-            } else {
-              const pr_branch = `${process.env.BRANCH_NAME}`;
-              const pr_sha = `${process.env.PR_SHA}`;
-              const pr_owner = `${process.env.PR_OWNER}`;
-              const { data } = await github.rest.pulls.list({ owner, repo, head: `${pr_owner}:${pr_branch}`, state: "open" });
-              core.debug(JSON.stringify(data, null, 2));
-              pulls = data.filter((pr) => pr.head.sha === pr_sha && pr.labels.find((l) => l.name === "build-pr-jar"));
-            }
-
-            if (!pulls.length) {
-              return core.notice("This workflow doesn't have any pull requests!");
-            } else if (pulls.length > 1) {
-              core.info(JSON.stringify(pulls, null, 2));
-              return core.error("Found multiple matching PRs");
-            }
-            const pull_request = pulls[0];
-
-            const artifacts = await github.paginate(github.rest.actions.listWorkflowRunArtifacts, { owner, repo, run_id });
-            if (!artifacts.length) {
-              return core.info("Skipping comment due to no artifact found");
-            }
-            const artifact = artifacts.find((art) => art.name === `paper-${pull_request.number}`);
-            if (!artifact) {
-              return core.info("Skipping comment to no matching artifact found");
-            }
-
-            const link = `https://nightly.link/${owner}/${repo}/actions/artifacts/${artifact.id}.zip`;
-            const body = `Download the paperclip jar for this pull request: [${artifact.name}.zip](${link})`;
-            core.info(`Adding a link to ${link}`);
-            await updatePR(owner, repo, pull_request.number, "paperclip-pr-build", body);

.github/workflows/publish_pr.yml

@@ -0,0 +1,36 @@
+name: Publish PR
+
+on:
+  workflow_run:
+    workflows: [ "Build Paper" ]
+    types:
+      - completed
+
+permissions:
+  packages: write # To upload the PR
+  actions: write # To get information about the uploading workflow run and to delete the run artifacts
+  contents: write # To download the `maven-publish` artifact, and to be able to create commit comments
+  issues: write # To be able to create PR comments
+  pull-requests: write # To be able to create PR comments
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Generate an Application repository access token
+        id: gen_repo_token
+        uses: kattecon/gh-app-access-token-gen@v1
+        with:
+          app_id: 1408328
+          private_key: ${{ secrets.PR_PUBLISHING_GH_APP_KEY }}
+          repository: ${{ github.repository }}
+      - name: Publish PR
+        uses: PaperMC/action-pr-publishing@paper
+        env:
+          GITHUB_TOKEN: ${{ steps.gen_repo_token.outputs.token }}
+        with:
+          publishing-token: ${{ github.token }}
+          uploader-workflow-name: Build Paper
+          artifacts-base-path: io/papermc/paper
+          base-maven-url: 'https://maven-prs.papermc.io'
+          self-name: 'papermc-pr-publishing[bot]'

.github/workflows/test_results.yml

@@ -21,12 +21,14 @@ jobs:
         uses: dawidd6/action-download-artifact@v6
         with:
           run_id: ${{ github.event.workflow_run.id }}
-          path: artifacts
+          path: test_artifacts
+          name: "Test Results|Event File"
+          name_is_regexp: true
       - name: Publish Test Results
         uses: EnricoMi/publish-unit-test-result-action@v2
         with:
           commit: ${{ github.event.workflow_run.head_sha }}
-          event_file: artifacts/Event File/event.json
+          event_file: test_artifacts/Event File/event.json
           event_name: ${{ github.event.workflow_run.event }}
-          files: "artifacts/**/*.xml"
+          files: "test_artifacts/**/*.xml"
           comment_mode: off

README.md

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

build-data/paper.at

@@ -140,12 +140,11 @@ public net.minecraft.world.effect.MobEffect attributeModifiers
 public net.minecraft.world.effect.MobEffect$AttributeTemplate
 public net.minecraft.world.effect.MobEffectInstance hiddenEffect
 public net.minecraft.world.entity.AreaEffectCloud durationOnUse
-public net.minecraft.world.entity.AreaEffectCloud ownerUUID
+public net.minecraft.world.entity.AreaEffectCloud owner
 public net.minecraft.world.entity.AreaEffectCloud potionContents
 public net.minecraft.world.entity.AreaEffectCloud radiusOnUse
 public net.minecraft.world.entity.AreaEffectCloud radiusPerTick
 public net.minecraft.world.entity.AreaEffectCloud reapplicationDelay
-public net.minecraft.world.entity.AreaEffectCloud updateColor()V
 public net.minecraft.world.entity.AreaEffectCloud waitTime
 public net.minecraft.world.entity.Display DATA_POS_ROT_INTERPOLATION_DURATION_ID
 public net.minecraft.world.entity.Display createTransformation(Lnet/minecraft/network/syncher/SynchedEntityData;)Lcom/mojang/math/Transformation;
@@ -330,14 +329,8 @@ public net.minecraft.world.entity.animal.wolf.Wolf setSoundVariant(Lnet/minecraf
 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
 public net.minecraft.world.entity.decoration.ArmorStand disabledSlots
-public net.minecraft.world.entity.decoration.ArmorStand headPose
 public net.minecraft.world.entity.decoration.ArmorStand isDisabled(Lnet/minecraft/world/entity/EquipmentSlot;)Z
-public net.minecraft.world.entity.decoration.ArmorStand leftArmPose
-public net.minecraft.world.entity.decoration.ArmorStand leftLegPose
-public net.minecraft.world.entity.decoration.ArmorStand rightArmPose
-public net.minecraft.world.entity.decoration.ArmorStand rightLegPose
 public net.minecraft.world.entity.decoration.ArmorStand setMarker(Z)V
 public net.minecraft.world.entity.decoration.ArmorStand setSmall(Z)V
 public net.minecraft.world.entity.decoration.HangingEntity setDirection(Lnet/minecraft/core/Direction;)V
@@ -364,8 +357,6 @@ public net.minecraft.world.entity.monster.Creeper explodeCreeper()V
 public net.minecraft.world.entity.monster.Creeper explosionRadius
 public net.minecraft.world.entity.monster.Creeper maxSwell
 public net.minecraft.world.entity.monster.Creeper swell
-public net.minecraft.world.entity.monster.Drowned groundNavigation
-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
@@ -392,6 +383,7 @@ public net.minecraft.world.entity.monster.SpellcasterIllager$IllagerSpell
 public net.minecraft.world.entity.monster.Strider steering
 public net.minecraft.world.entity.monster.Vex hasLimitedLife
 public net.minecraft.world.entity.monster.Vex limitedLifeTicks
+public net.minecraft.world.entity.monster.Vex owner
 public net.minecraft.world.entity.monster.Vindicator DOOR_BREAKING_PREDICATE
 public net.minecraft.world.entity.monster.Vindicator isJohnny
 public net.minecraft.world.entity.monster.Witch usingTime
@@ -419,6 +411,7 @@ public net.minecraft.world.entity.npc.Villager increaseMerchantCareer()V
 public net.minecraft.world.entity.npc.Villager numberOfRestocksToday
 public net.minecraft.world.entity.npc.Villager releaseAllPois()V
 public net.minecraft.world.entity.npc.Villager setUnhappy()V
+public net.minecraft.world.entity.npc.Villager updateDemand()V
 public net.minecraft.world.entity.npc.WanderingTrader getWanderTarget()Lnet/minecraft/core/BlockPos;
 public net.minecraft.world.entity.player.Abilities flyingSpeed
 public net.minecraft.world.entity.player.Abilities walkingSpeed
@@ -449,9 +442,7 @@ public net.minecraft.world.entity.projectile.Arrow updateColor()V
 public net.minecraft.world.entity.projectile.EvokerFangs warmupDelayTicks
 public net.minecraft.world.entity.projectile.EyeOfEnder life
 public net.minecraft.world.entity.projectile.EyeOfEnder surviveAfterDeath
-public net.minecraft.world.entity.projectile.EyeOfEnder tx
+public net.minecraft.world.entity.projectile.EyeOfEnder target
-public net.minecraft.world.entity.projectile.EyeOfEnder ty
-public net.minecraft.world.entity.projectile.EyeOfEnder tz
 public net.minecraft.world.entity.projectile.FireworkRocketEntity DATA_ATTACHED_TO_TARGET
 public net.minecraft.world.entity.projectile.FireworkRocketEntity DATA_ID_FIREWORKS_ITEM
 public net.minecraft.world.entity.projectile.FireworkRocketEntity DATA_SHOT_AT_ANGLE
@@ -471,10 +462,9 @@ public net.minecraft.world.entity.projectile.FishingHook timeUntilHooked
 public net.minecraft.world.entity.projectile.FishingHook timeUntilLured
 public net.minecraft.world.entity.projectile.FishingHook$FishHookState
 public net.minecraft.world.entity.projectile.LargeFireball explosionPower
-public net.minecraft.world.entity.projectile.Projectile cachedOwner
 public net.minecraft.world.entity.projectile.Projectile hasBeenShot
 public net.minecraft.world.entity.projectile.Projectile leftOwner
-public net.minecraft.world.entity.projectile.Projectile ownerUUID
+public net.minecraft.world.entity.projectile.Projectile owner
 public net.minecraft.world.entity.projectile.ShulkerBullet currentMoveDirection
 public net.minecraft.world.entity.projectile.ShulkerBullet flightSteps
 public net.minecraft.world.entity.projectile.ShulkerBullet targetDeltaX
@@ -615,7 +605,7 @@ public net.minecraft.world.level.block.entity.BedBlockEntity color
 public net.minecraft.world.level.block.entity.BeehiveBlockEntity savedFlowerPos
 public net.minecraft.world.level.block.entity.BellBlockEntity resonating
 public net.minecraft.world.level.block.entity.BellBlockEntity resonationTicks
-public net.minecraft.world.level.block.entity.BlockEntity saveId(Lnet/minecraft/nbt/CompoundTag;)V
+public net.minecraft.world.level.block.entity.BlockEntity saveId(Lnet/minecraft/world/level/storage/ValueOutput;)V
 public net.minecraft.world.level.block.entity.BlockEntityType validBlocks
 public net.minecraft.world.level.block.entity.BrewingStandBlockEntity brewTime
 public net.minecraft.world.level.block.entity.BrewingStandBlockEntity fuel
@@ -627,10 +617,11 @@ public net.minecraft.world.level.block.entity.CampfireBlockEntity cookingTime
 public net.minecraft.world.level.block.entity.ChestBlockEntity openersCounter
 public net.minecraft.world.level.block.entity.ChestBlockEntity playSound(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/sounds/SoundEvent;)V
 public net.minecraft.world.level.block.entity.ChiseledBookShelfBlockEntity lastInteractedSlot
+public net.minecraft.world.level.block.entity.ConduitBlockEntity MIN_KILL_SIZE
 public net.minecraft.world.level.block.entity.ConduitBlockEntity destroyTarget
-public net.minecraft.world.level.block.entity.ConduitBlockEntity destroyTargetUUID
 public net.minecraft.world.level.block.entity.ConduitBlockEntity effectBlocks
 public net.minecraft.world.level.block.entity.ConduitBlockEntity getDestroyRangeAABB(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/phys/AABB;
+public net.minecraft.world.level.block.entity.ConduitBlockEntity updateDestroyTarget(Lnet/minecraft/world/entity/EntityReference;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Z)Lnet/minecraft/world/entity/EntityReference;
 public net.minecraft.world.level.block.entity.CrafterBlockEntity craftingTicksRemaining
 public net.minecraft.world.level.block.entity.DecoratedPotBlockEntity decorations
 public net.minecraft.world.level.block.entity.EnderChestBlockEntity openersCounter
@@ -664,13 +655,14 @@ public net.minecraft.world.level.block.entity.TheEndGatewayBlockEntity age
 public net.minecraft.world.level.block.entity.TheEndGatewayBlockEntity exactTeleport
 public net.minecraft.world.level.block.entity.TheEndGatewayBlockEntity exitPortal
 public net.minecraft.world.level.block.entity.TrialSpawnerBlockEntity trialSpawner
+public net.minecraft.world.level.block.entity.trialspawner.TrialSpawner config
 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.TrialSpawnerStateData cooldownEndsAt
-public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerData currentMobs
+public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerStateData currentMobs
-public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerData detectedPlayers
+public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerStateData detectedPlayers
-public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerData nextMobSpawnsAt
+public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerStateData nextMobSpawnsAt
-public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerData nextSpawnData
+public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerStateData 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
@@ -689,7 +681,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.status.ChunkStatusTasks postLoadProtoChunk(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/storage/ValueInput$ValueInputList;)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
@@ -776,10 +768,6 @@ 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
-public-f net.minecraft.world.level.block.entity.trialspawner.TrialSpawner requiredPlayerRange
-public-f net.minecraft.world.level.block.entity.trialspawner.TrialSpawner targetCooldownLength
 public-f net.minecraft.world.level.saveddata.maps.MapItemSavedData centerX
 public-f net.minecraft.world.level.saveddata.maps.MapItemSavedData centerZ
 public-f net.minecraft.world.level.saveddata.maps.MapItemSavedData dimension

build-data/reobf-mappings-patch.tiny

@@ -21,7 +21,7 @@ c	net/minecraft/world/level/chunk/LevelChunk	net/minecraft/world/level/chunk/Chu
 
 # See mappings-patch.tiny
 c	net/minecraft/server/level/ChunkMap	net/minecraft/server/level/PlayerChunkMap
-	f	Lnet/minecraft/server/level/ChunkMap$ChunkDistanceManager;	distanceManager	G
+	f	Lnet/minecraft/server/level/ChunkMap$ChunkDistanceManager;	distanceManager	H
 
 # The method is made public by Spigot, which then causes accidental overrides
 c	net/minecraft/world/entity/Entity	net/minecraft/world/entity/Entity

gradle.properties

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

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

paper-api/build.gradle.kts

@@ -11,7 +11,7 @@ java {
 
 val annotationsVersion = "26.0.2"
 // Keep in sync with paper-server adventure-text-serializer-ansi dep
-val adventureVersion = "4.21.0"
+val adventureVersion = "4.23.0"
 val bungeeCordChatVersion = "1.21-R0.2-deprecated+build.21"
 val slf4jVersion = "2.0.16"
 val log4jVersion = "2.24.1"

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

@@ -21,6 +21,7 @@ import org.bukkit.entity.Fish;
 import org.bukkit.entity.Fox;
 import org.bukkit.entity.Ghast;
 import org.bukkit.entity.Guardian;
+import org.bukkit.entity.HappyGhast;
 import org.bukkit.entity.Illager;
 import org.bukkit.entity.Illusioner;
 import org.bukkit.entity.IronGolem;
@@ -67,17 +68,17 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public interface VanillaGoal<T extends Mob> extends Goal<T> {
-    GoalKey<AbstractHorse> RANDOM_STAND = create("random_stand", AbstractHorse.class);
+    GoalKey<AbstractHorse> HORSE_RANDOM_STAND = create("horse_random_stand", AbstractHorse.class);
 
-    GoalKey<AbstractHorse> RUN_AROUND_LIKE_CRAZY = create("run_around_like_crazy", AbstractHorse.class);
+    GoalKey<AbstractHorse> HORSE_RUN_AROUND_LIKE_CRAZY = create("horse_run_around_like_crazy", AbstractHorse.class);
 
-    GoalKey<AbstractSkeleton> ABSTRACT_SKELETON_MELEE = create("abstract_skeleton_melee", AbstractSkeleton.class);
+    GoalKey<AbstractSkeleton> SKELETON_MELEE = create("skeleton_melee", AbstractSkeleton.class);
 
-    GoalKey<AbstractVillager> LOOK_AT_TRADING_PLAYER = create("look_at_trading_player", AbstractVillager.class);
+    GoalKey<AbstractVillager> VILLAGER_LOOK_AT_TRADING_PLAYER = create("villager_look_at_trading_player", AbstractVillager.class);
 
-    GoalKey<AbstractVillager> TRADE_WITH_PLAYER = create("trade_with_player", AbstractVillager.class);
+    GoalKey<AbstractVillager> VILLAGER_TRADE_WITH_PLAYER = create("villager_trade_with_player", AbstractVillager.class);
 
     GoalKey<Animals> BREED = create("breed", Animals.class);
 
@@ -101,12 +102,12 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
 
     GoalKey<Bee> BEE_POLLINATE = create("bee_pollinate", Bee.class);
 
+    GoalKey<Bee> BEE_VALIDATE_FLOWER = create("bee_validate_flower", Bee.class);
+
+    GoalKey<Bee> BEE_VALIDATE_HIVE = create("bee_validate_hive", Bee.class);
+
     GoalKey<Bee> BEE_WANDER = create("bee_wander", Bee.class);
 
-    GoalKey<Bee> VALIDATE_FLOWER = create("validate_flower", Bee.class);
-
-    GoalKey<Bee> VALIDATE_HIVE = create("validate_hive", Bee.class);
-
     GoalKey<Blaze> BLAZE_ATTACK = create("blaze_attack", Blaze.class);
 
     GoalKey<Cat> CAT_AVOID_ENTITY = create("cat_avoid_entity", Cat.class);
@@ -165,16 +166,16 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
 
     GoalKey<Creature> WATER_AVOIDING_RANDOM_STROLL = create("water_avoiding_random_stroll", Creature.class);
 
-    GoalKey<Creeper> SWELL = create("swell", Creeper.class);
+    GoalKey<Creeper> CREEPER_SWELL = create("creeper_swell", Creeper.class);
 
     GoalKey<Dolphin> DOLPHIN_JUMP = create("dolphin_jump", Dolphin.class);
 
+    GoalKey<Dolphin> DOLPHIN_PLAY_WITH_ITEMS = create("dolphin_play_with_items", Dolphin.class);
+
     GoalKey<Dolphin> DOLPHIN_SWIM_TO_TREASURE = create("dolphin_swim_to_treasure", Dolphin.class);
 
     GoalKey<Dolphin> DOLPHIN_SWIM_WITH_PLAYER = create("dolphin_swim_with_player", Dolphin.class);
 
-    GoalKey<Dolphin> PLAY_WITH_ITEMS = create("play_with_items", Dolphin.class);
-
     GoalKey<Drowned> DROWNED_ATTACK = create("drowned_attack", Drowned.class);
 
     GoalKey<Drowned> DROWNED_GO_TO_BEACH = create("drowned_go_to_beach", Drowned.class);
@@ -199,14 +200,14 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
 
     GoalKey<Fish> FISH_SWIM = create("fish_swim", Fish.class);
 
-    GoalKey<Fox> DEFEND_TRUSTED = create("defend_trusted", Fox.class);
-
-    GoalKey<Fox> FACEPLANT = create("faceplant", Fox.class);
-
     GoalKey<Fox> FOX_BREED = create("fox_breed", Fox.class);
 
+    GoalKey<Fox> FOX_DEFEND_TRUSTED = create("fox_defend_trusted", Fox.class);
+
     GoalKey<Fox> FOX_EAT_BERRIES = create("fox_eat_berries", Fox.class);
 
+    GoalKey<Fox> FOX_FACEPLANT = create("fox_faceplant", Fox.class);
+
     GoalKey<Fox> FOX_FLOAT = create("fox_float", Fox.class);
 
     GoalKey<Fox> FOX_FOLLOW_PARENT = create("fox_follow_parent", Fox.class);
@@ -217,29 +218,27 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
 
     GoalKey<Fox> FOX_PANIC = create("fox_panic", Fox.class);
 
+    GoalKey<Fox> FOX_PERCH_AND_SEARCH = create("fox_perch_and_search", Fox.class);
+
     GoalKey<Fox> FOX_POUNCE = create("fox_pounce", Fox.class);
 
     GoalKey<Fox> FOX_SEARCH_FOR_ITEMS = create("fox_search_for_items", Fox.class);
 
+    GoalKey<Fox> FOX_SEEK_SHELTER = create("fox_seek_shelter", Fox.class);
+
+    GoalKey<Fox> FOX_SLEEP = create("fox_sleep", Fox.class);
+
+    GoalKey<Fox> FOX_STALK_PREY = create("fox_stalk_prey", Fox.class);
+
     GoalKey<Fox> FOX_STROLL_THROUGH_VILLAGE = create("fox_stroll_through_village", Fox.class);
 
-    GoalKey<Fox> PERCH_AND_SEARCH = create("perch_and_search", Fox.class);
-
-    GoalKey<Fox> SEEK_SHELTER = create("seek_shelter", Fox.class);
-
-    GoalKey<Fox> SLEEP = create("sleep", Fox.class);
-
-    GoalKey<Fox> STALK_PREY = create("stalk_prey", Fox.class);
-
-    GoalKey<Ghast> GHAST_LOOK = create("ghast_look", Ghast.class);
-
     GoalKey<Ghast> GHAST_SHOOT_FIREBALL = create("ghast_shoot_fireball", Ghast.class);
 
-    GoalKey<Ghast> RANDOM_FLOAT_AROUND = create("random_float_around", Ghast.class);
-
     GoalKey<Guardian> GUARDIAN_ATTACK = create("guardian_attack", Guardian.class);
 
-    GoalKey<Illager> HOLD_GROUND_ATTACK = create("hold_ground_attack", Illager.class);
+    GoalKey<HappyGhast> HAPPY_GHAST_FLOAT = create("happy_ghast_float", HappyGhast.class);
+
+    GoalKey<Illager> ILLAGER_HOLD_GROUND_ATTACK = create("illager_hold_ground_attack", Illager.class);
 
     GoalKey<Illager> RAIDER_OPEN_DOOR = create("raider_open_door", Illager.class);
 
@@ -247,9 +246,9 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
 
     GoalKey<Illusioner> ILLUSIONER_MIRROR_SPELL = create("illusioner_mirror_spell", Illusioner.class);
 
-    GoalKey<IronGolem> DEFEND_VILLAGE = create("defend_village", IronGolem.class);
+    GoalKey<IronGolem> IRON_GOLEM_DEFEND_VILLAGE = create("iron_golem_defend_village", IronGolem.class);
 
-    GoalKey<IronGolem> OFFER_FLOWER = create("offer_flower", IronGolem.class);
+    GoalKey<IronGolem> IRON_GOLEM_OFFER_FLOWER = create("iron_golem_offer_flower", IronGolem.class);
 
     GoalKey<Llama> LLAMA_ATTACK_WOLF = create("llama_attack_wolf", Llama.class);
 
@@ -269,6 +268,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
 
     GoalKey<Mob> FOLLOW_MOB = create("follow_mob", Mob.class);
 
+    GoalKey<Mob> GHAST_LOOK = create("ghast_look", Mob.class);
+
     GoalKey<Mob> INTERACT = create("interact", Mob.class);
 
     GoalKey<Mob> LEAP_AT = create("leap_at", Mob.class);
@@ -281,10 +282,14 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
 
     GoalKey<Mob> OPEN_DOOR = create("open_door", Mob.class);
 
+    GoalKey<Mob> RANDOM_FLOAT_AROUND = create("random_float_around", Mob.class);
+
     GoalKey<Mob> RANDOM_LOOK_AROUND = create("random_look_around", Mob.class);
 
     GoalKey<Mob> RESET_UNIVERSAL_ANGER = create("reset_universal_anger", Mob.class);
 
+    GoalKey<Mob> TEMPT_FOR_NON_PATHFINDERS = create("tempt_for_non_pathfinders", Mob.class);
+
     GoalKey<Mob> USE_ITEM = create("use_item", Mob.class);
 
     GoalKey<Mob> VINDICATOR_BREAK_DOOR = create("vindicator_break_door", Mob.class);
@@ -317,7 +322,7 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
 
     GoalKey<Panda> PANDA_SNEEZE = create("panda_sneeze", Panda.class);
 
-    GoalKey<Parrot> LAND_ON_OWNERS_SHOULDER = create("land_on_owners_shoulder", Parrot.class);
+    GoalKey<Parrot> PARROT_LAND_ON_OWNERS_SHOULDER = create("parrot_land_on_owners_shoulder", Parrot.class);
 
     GoalKey<Phantom> PHANTOM_ATTACK_PLAYER = create("phantom_attack_player", Phantom.class);
 
@@ -339,27 +344,27 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
 
     GoalKey<Rabbit> RABBIT_PANIC = create("rabbit_panic", Rabbit.class);
 
-    GoalKey<Rabbit> RAID_GARDEN = create("raid_garden", Rabbit.class);
+    GoalKey<Rabbit> RABBIT_RAID_GARDEN = create("rabbit_raid_garden", Rabbit.class);
-
-    GoalKey<Raider> LONG_DISTANCE_PATROL = create("long_distance_patrol", Raider.class);
-
-    GoalKey<Raider> NEAREST_ATTACKABLE_WITCH = create("nearest_attackable_witch", Raider.class);
-
-    GoalKey<Raider> NEAREST_HEALABLE_RAIDER = create("nearest_healable_raider", Raider.class);
-
-    GoalKey<Raider> OBTAIN_RAID_LEADER_BANNER = create("obtain_raid_leader_banner", Raider.class);
-
-    GoalKey<Raider> PATHFIND_TO_RAID = create("pathfind_to_raid", Raider.class);
 
     GoalKey<Raider> RAIDER_CELEBRATION = create("raider_celebration", Raider.class);
 
+    GoalKey<Raider> RAIDER_LONG_DISTANCE_PATROL = create("raider_long_distance_patrol", Raider.class);
+
     GoalKey<Raider> RAIDER_MOVE_THROUGH_VILLAGE = create("raider_move_through_village", Raider.class);
 
+    GoalKey<Raider> RAIDER_NEAREST_ATTACKABLE_WITCH = create("raider_nearest_attackable_witch", Raider.class);
+
+    GoalKey<Raider> RAIDER_NEAREST_HEALABLE_RAIDER = create("raider_nearest_healable_raider", Raider.class);
+
+    GoalKey<Raider> RAIDER_OBTAIN_RAID_LEADER_BANNER = create("raider_obtain_raid_leader_banner", Raider.class);
+
+    GoalKey<Raider> RAIDER_PATHFIND_TO_RAID = create("raider_pathfind_to_raid", Raider.class);
+
     GoalKey<RangedEntity> DROWNED_TRIDENT_ATTACK = create("drowned_trident_attack", RangedEntity.class);
 
     GoalKey<RangedEntity> RANGED_ATTACK = create("ranged_attack", RangedEntity.class);
 
-    GoalKey<SchoolableFish> FOLLOW_FLOCK_LEADER = create("follow_flock_leader", SchoolableFish.class);
+    GoalKey<SchoolableFish> SCHOOLABLE_FISH_FOLLOW_FLOCK_LEADER = create("schoolable_fish_follow_flock_leader", SchoolableFish.class);
 
     GoalKey<Shulker> SHULKER_ATTACK = create("shulker_attack", Shulker.class);
 
@@ -373,7 +378,7 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
 
     GoalKey<Silverfish> SILVERFISH_WAKE_UP_FRIENDS = create("silverfish_wake_up_friends", Silverfish.class);
 
-    GoalKey<SkeletonHorse> SKELETON_TRAP = create("skeleton_trap", SkeletonHorse.class);
+    GoalKey<SkeletonHorse> SKELETON_HORSE_SKELETON_TRAP = create("skeleton_horse_skeleton_trap", SkeletonHorse.class);
 
     GoalKey<Slime> SLIME_ATTACK = create("slime_attack", Slime.class);
 
@@ -429,14 +434,14 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
 
     GoalKey<Vindicator> VINDICATOR_JOHNNY_ATTACK = create("vindicator_johnny_attack", Vindicator.class);
 
-    GoalKey<WanderingTrader> WANDER_TO_POSITION = create("wander_to_position", WanderingTrader.class);
+    GoalKey<WanderingTrader> WANDERING_TRADER_WANDER_TO_POSITION = create("wandering_trader_wander_to_position", WanderingTrader.class);
 
     GoalKey<Wither> WITHER_DO_NOTHING = create("wither_do_nothing", Wither.class);
 
-    GoalKey<Wolf> BEG = create("beg", Wolf.class);
-
     GoalKey<Wolf> WOLF_AVOID_ENTITY = create("wolf_avoid_entity", Wolf.class);
 
+    GoalKey<Wolf> WOLF_BEG = create("wolf_beg", Wolf.class);
+
     GoalKey<Zombie> ZOMBIE_ATTACK = create("zombie_attack", Zombie.class);
 
     GoalKey<Zombie> ZOMBIE_ATTACK_TURTLE_EGG = create("zombie_attack_turtle_egg", Zombie.class);

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

@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class AttributeKeys {
     /**
      * {@code minecraft:armor}
@@ -81,6 +81,13 @@ public final class AttributeKeys {
      */
     public static final TypedKey<Attribute> BURNING_TIME = create(key("burning_time"));
 
+    /**
+     * {@code minecraft:camera_distance}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> CAMERA_DISTANCE = create(key("camera_distance"));
+
     /**
      * {@code minecraft:entity_interaction_range}
      *
@@ -249,6 +256,20 @@ public final class AttributeKeys {
      */
     public static final TypedKey<Attribute> WATER_MOVEMENT_EFFICIENCY = create(key("water_movement_efficiency"));
 
+    /**
+     * {@code minecraft:waypoint_receive_range}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> WAYPOINT_RECEIVE_RANGE = create(key("waypoint_receive_range"));
+
+    /**
+     * {@code minecraft:waypoint_transmit_range}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> WAYPOINT_TRANSMIT_RANGE = create(key("waypoint_transmit_range"));
+
     private AttributeKeys() {
     }
 

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

@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class BannerPatternKeys {
     /**
      * {@code minecraft:base}

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

@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class BiomeKeys {
     /**
      * {@code minecraft:badlands}

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

@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class BlockTypeKeys {
     /**
      * {@code minecraft:acacia_button}
@@ -2475,6 +2475,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> DRAGON_WALL_HEAD = create(key("dragon_wall_head"));
 
+    /**
+     * {@code minecraft:dried_ghast}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> DRIED_GHAST = create(key("dried_ghast"));
+
     /**
      * {@code minecraft:dried_kelp_block}
      *

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

@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class CatVariantKeys {
     /**
      * {@code minecraft:all_black}

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

@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class ChickenVariantKeys {
     /**
      * {@code minecraft:cold}

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

@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class CowVariantKeys {
     /**
      * {@code minecraft:cold}

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

@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class DamageTypeKeys {
     /**
      * {@code minecraft:arrow}

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

@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class DataComponentTypeKeys {
     /**
      * {@code minecraft:attribute_modifiers}

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

@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class EnchantmentKeys {
     /**
      * {@code minecraft:aqua_affinity}

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

@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class FluidKeys {
     /**
      * {@code minecraft:empty}

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

@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class FrogVariantKeys {
     /**
      * {@code minecraft:cold}

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

@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class GameEventKeys {
     /**
      * {@code minecraft:block_activate}

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

@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class InstrumentKeys {
     /**
      * {@code minecraft:admire_goat_horn}

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

@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class JukeboxSongKeys {
     /**
      * {@code minecraft:11}
@@ -144,6 +144,13 @@ public final class JukeboxSongKeys {
      */
     public static final TypedKey<JukeboxSong> STRAD = create(key("strad"));
 
+    /**
+     * {@code minecraft:tears}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<JukeboxSong> TEARS = create(key("tears"));
+
     /**
      * {@code minecraft:wait}
      *

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

@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class MapDecorationTypeKeys {
     /**
      * {@code minecraft:banner_black}

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

@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class MenuTypeKeys {
     /**
      * {@code minecraft:anvil}

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

@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class MobEffectKeys {
     /**
      * {@code minecraft:absorption}

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

@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class PaintingVariantKeys {
     /**
      * {@code minecraft:alban}

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

@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class PigVariantKeys {
     /**
      * {@code minecraft:cold}

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

@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class SoundEventKeys {
     /**
      * {@code minecraft:ambient.basalt_deltas.additions}
@@ -1929,6 +1929,62 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> BLOCK_DISPENSER_LAUNCH = create(key("block.dispenser.launch"));
 
+    /**
+     * {@code minecraft:block.dried_ghast.ambient}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_DRIED_GHAST_AMBIENT = create(key("block.dried_ghast.ambient"));
+
+    /**
+     * {@code minecraft:block.dried_ghast.ambient_water}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_DRIED_GHAST_AMBIENT_WATER = create(key("block.dried_ghast.ambient_water"));
+
+    /**
+     * {@code minecraft:block.dried_ghast.break}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_DRIED_GHAST_BREAK = create(key("block.dried_ghast.break"));
+
+    /**
+     * {@code minecraft:block.dried_ghast.fall}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_DRIED_GHAST_FALL = create(key("block.dried_ghast.fall"));
+
+    /**
+     * {@code minecraft:block.dried_ghast.place}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_DRIED_GHAST_PLACE = create(key("block.dried_ghast.place"));
+
+    /**
+     * {@code minecraft:block.dried_ghast.place_in_water}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_DRIED_GHAST_PLACE_IN_WATER = create(key("block.dried_ghast.place_in_water"));
+
+    /**
+     * {@code minecraft:block.dried_ghast.step}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_DRIED_GHAST_STEP = create(key("block.dried_ghast.step"));
+
+    /**
+     * {@code minecraft:block.dried_ghast.transition}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_DRIED_GHAST_TRANSITION = create(key("block.dried_ghast.transition"));
+
     /**
      * {@code minecraft:block.dripstone_block.break}
      *
@@ -1964,6 +2020,13 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> BLOCK_DRIPSTONE_BLOCK_STEP = create(key("block.dripstone_block.step"));
 
+    /**
+     * {@code minecraft:block.dry_grass.ambient}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_DRY_GRASS_AMBIENT = create(key("block.dry_grass.ambient"));
+
     /**
      * {@code minecraft:block.enchantment_table.use}
      *
@@ -4113,13 +4176,6 @@ 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}
      *
@@ -7207,6 +7263,34 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> ENTITY_GHAST_WARN = create(key("entity.ghast.warn"));
 
+    /**
+     * {@code minecraft:entity.ghastling.ambient}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_GHASTLING_AMBIENT = create(key("entity.ghastling.ambient"));
+
+    /**
+     * {@code minecraft:entity.ghastling.death}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_GHASTLING_DEATH = create(key("entity.ghastling.death"));
+
+    /**
+     * {@code minecraft:entity.ghastling.hurt}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_GHASTLING_HURT = create(key("entity.ghastling.hurt"));
+
+    /**
+     * {@code minecraft:entity.ghastling.spawn}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_GHASTLING_SPAWN = create(key("entity.ghastling.spawn"));
+
     /**
      * {@code minecraft:entity.glow_item_frame.add_item}
      *
@@ -7452,6 +7536,62 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> ENTITY_GUARDIAN_HURT_LAND = create(key("entity.guardian.hurt_land"));
 
+    /**
+     * {@code minecraft:entity.happy_ghast.ambient}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_HAPPY_GHAST_AMBIENT = create(key("entity.happy_ghast.ambient"));
+
+    /**
+     * {@code minecraft:entity.happy_ghast.death}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_HAPPY_GHAST_DEATH = create(key("entity.happy_ghast.death"));
+
+    /**
+     * {@code minecraft:entity.happy_ghast.equip}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_HAPPY_GHAST_EQUIP = create(key("entity.happy_ghast.equip"));
+
+    /**
+     * {@code minecraft:entity.happy_ghast.harness_goggles_down}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_HAPPY_GHAST_HARNESS_GOGGLES_DOWN = create(key("entity.happy_ghast.harness_goggles_down"));
+
+    /**
+     * {@code minecraft:entity.happy_ghast.harness_goggles_up}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_HAPPY_GHAST_HARNESS_GOGGLES_UP = create(key("entity.happy_ghast.harness_goggles_up"));
+
+    /**
+     * {@code minecraft:entity.happy_ghast.hurt}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_HAPPY_GHAST_HURT = create(key("entity.happy_ghast.hurt"));
+
+    /**
+     * {@code minecraft:entity.happy_ghast.riding}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_HAPPY_GHAST_RIDING = create(key("entity.happy_ghast.riding"));
+
+    /**
+     * {@code minecraft:entity.happy_ghast.unequip}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_HAPPY_GHAST_UNEQUIP = create(key("entity.happy_ghast.unequip"));
+
     /**
      * {@code minecraft:entity.hoglin.ambient}
      *
@@ -7816,20 +7956,6 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> ENTITY_ITEM_FRAME_ROTATE_ITEM = create(key("entity.item_frame.rotate_item"));
 
-    /**
-     * {@code minecraft:entity.leash_knot.break}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_LEASH_KNOT_BREAK = create(key("entity.leash_knot.break"));
-
-    /**
-     * {@code minecraft:entity.leash_knot.place}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_LEASH_KNOT_PLACE = create(key("entity.leash_knot.place"));
-
     /**
      * {@code minecraft:entity.lightning_bolt.impact}
      *
@@ -8880,13 +9006,6 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> ENTITY_POLAR_BEAR_WARNING = create(key("entity.polar_bear.warning"));
 
-    /**
-     * {@code minecraft:entity.puffer_fish.ambient}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_PUFFER_FISH_AMBIENT = create(key("entity.puffer_fish.ambient"));
-
     /**
      * {@code minecraft:entity.puffer_fish.blow_out}
      *
@@ -11323,6 +11442,13 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> ITEM_HONEYCOMB_WAX_ON = create(key("item.honeycomb.wax_on"));
 
+    /**
+     * {@code minecraft:item.horse_armor.unequip}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ITEM_HORSE_ARMOR_UNEQUIP = create(key("item.horse_armor.unequip"));
+
     /**
      * {@code minecraft:item.ink_sac.use}
      *
@@ -11330,6 +11456,34 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> ITEM_INK_SAC_USE = create(key("item.ink_sac.use"));
 
+    /**
+     * {@code minecraft:item.lead.break}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ITEM_LEAD_BREAK = create(key("item.lead.break"));
+
+    /**
+     * {@code minecraft:item.lead.tied}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ITEM_LEAD_TIED = create(key("item.lead.tied"));
+
+    /**
+     * {@code minecraft:item.lead.untied}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ITEM_LEAD_UNTIED = create(key("item.lead.untied"));
+
+    /**
+     * {@code minecraft:item.llama_carpet.unequip}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ITEM_LLAMA_CARPET_UNEQUIP = create(key("item.llama_carpet.unequip"));
+
     /**
      * {@code minecraft:item.lodestone_compass.lock}
      *
@@ -11372,6 +11526,20 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> ITEM_OMINOUS_BOTTLE_DISPOSE = create(key("item.ominous_bottle.dispose"));
 
+    /**
+     * {@code minecraft:item.saddle.unequip}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ITEM_SADDLE_UNEQUIP = create(key("item.saddle.unequip"));
+
+    /**
+     * {@code minecraft:item.shears.snip}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ITEM_SHEARS_SNIP = create(key("item.shears.snip"));
+
     /**
      * {@code minecraft:item.shield.block}
      *
@@ -11834,6 +12002,13 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> MUSIC_DISC_STRAD = create(key("music_disc.strad"));
 
+    /**
+     * {@code minecraft:music_disc.tears}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> MUSIC_DISC_TEARS = create(key("music_disc.tears"));
+
     /**
      * {@code minecraft:music_disc.wait}
      *

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

@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class StructureKeys {
     /**
      * {@code minecraft:ancient_city}

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

@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class StructureTypeKeys {
     /**
      * {@code minecraft:buried_treasure}

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

@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class TrimMaterialKeys {
     /**
      * {@code minecraft:amethyst}

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

@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class TrimPatternKeys {
     /**
      * {@code minecraft:bolt}

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

@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class VillagerProfessionKeys {
     /**
      * {@code minecraft:armorer}

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

@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class VillagerTypeKeys {
     /**
      * {@code minecraft:desert}

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

@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class WolfSoundVariantKeys {
     /**
      * {@code minecraft:angry}

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

@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 public final class WolfVariantKeys {
     /**
      * {@code minecraft:ashen}

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

@@ -24,7 +24,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 @ApiStatus.Experimental
 public final class BannerPatternTagKeys {
     /**

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

@@ -24,7 +24,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 @ApiStatus.Experimental
 public final class BiomeTagKeys {
     /**

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

@@ -24,7 +24,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 @ApiStatus.Experimental
 public final class BlockTypeTagKeys {
     /**
@@ -580,6 +580,13 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> GUARDED_BY_PIGLINS = create(key("guarded_by_piglins"));
 
+    /**
+     * {@code #minecraft:happy_ghast_avoids}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> HAPPY_GHAST_AVOIDS = create(key("happy_ghast_avoids"));
+
     /**
      * {@code #minecraft:hoglin_repellents}
      *
@@ -909,13 +916,6 @@ 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}
      *
@@ -1203,6 +1203,27 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> TRAPDOORS = create(key("trapdoors"));
 
+    /**
+     * {@code #minecraft:triggers_ambient_desert_dry_vegetation_block_sounds}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> TRIGGERS_AMBIENT_DESERT_DRY_VEGETATION_BLOCK_SOUNDS = create(key("triggers_ambient_desert_dry_vegetation_block_sounds"));
+
+    /**
+     * {@code #minecraft:triggers_ambient_desert_sand_block_sounds}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> TRIGGERS_AMBIENT_DESERT_SAND_BLOCK_SOUNDS = create(key("triggers_ambient_desert_sand_block_sounds"));
+
+    /**
+     * {@code #minecraft:triggers_ambient_dried_ghast_block_sounds}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> TRIGGERS_AMBIENT_DRIED_GHAST_BLOCK_SOUNDS = create(key("triggers_ambient_dried_ghast_block_sounds"));
+
     /**
      * {@code #minecraft:underwater_bonemeals}
      *

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

@@ -24,7 +24,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 @ApiStatus.Experimental
 public final class DamageTypeTagKeys {
     /**

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

@@ -25,7 +25,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 @ApiStatus.Experimental
 public final class EnchantmentTagKeys {
     /**

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

@@ -24,7 +24,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 @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_harness}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<EntityType> CAN_EQUIP_HARNESS = create(key("can_equip_harness"));
+
     /**
      * {@code #minecraft:can_equip_saddle}
      *
@@ -125,6 +132,13 @@ public final class EntityTypeTagKeys {
      */
     public static final TagKey<EntityType> FALL_DAMAGE_IMMUNE = create(key("fall_damage_immune"));
 
+    /**
+     * {@code #minecraft:followable_friendly_mobs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<EntityType> FOLLOWABLE_FRIENDLY_MOBS = create(key("followable_friendly_mobs"));
+
     /**
      * {@code #minecraft:freeze_hurts_extra_types}
      *

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

@@ -24,7 +24,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 @ApiStatus.Experimental
 public final class FluidTagKeys {
     /**

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

@@ -24,7 +24,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 @ApiStatus.Experimental
 public final class GameEventTagKeys {
     /**

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

@@ -24,7 +24,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 @ApiStatus.Experimental
 public final class InstrumentTagKeys {
     /**

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

@@ -24,7 +24,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 @ApiStatus.Experimental
 public final class ItemTypeTagKeys {
     /**
@@ -601,6 +601,27 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> HANGING_SIGNS = create(key("hanging_signs"));
 
+    /**
+     * {@code #minecraft:happy_ghast_food}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> HAPPY_GHAST_FOOD = create(key("happy_ghast_food"));
+
+    /**
+     * {@code #minecraft:happy_ghast_tempt_items}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> HAPPY_GHAST_TEMPT_ITEMS = create(key("happy_ghast_tempt_items"));
+
+    /**
+     * {@code #minecraft:harnesses}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> HARNESSES = create(key("harnesses"));
+
     /**
      * {@code #minecraft:head_armor}
      *

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

@@ -24,7 +24,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 @ApiStatus.Experimental
 public final class PaintingVariantTagKeys {
     /**

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

@@ -24,7 +24,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedFrom("1.21.6")
 @ApiStatus.Experimental
 public final class StructureTagKeys {
     /**

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

@@ -317,7 +317,7 @@ public class MaterialTags {
      */
     public static final MaterialSetTag SPAWN_EGGS = new MaterialSetTag(keyFor("spawn_eggs"))
         .endsWith("_SPAWN_EGG")
-        .ensureSize("SPAWN_EGGS", 81).lock();
+        .ensureSize("SPAWN_EGGS", 82).lock();
 
     /**
      * Covers all colors of stained glass.

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

@@ -15,45 +15,46 @@ import org.jspecify.annotations.Nullable;
 @NullMarked
 public final class GoalKey<T extends Mob> {
 
-    private final Class<T> entityClass;
+    private final Class<T> type;
-    private final NamespacedKey namespacedKey;
+    private final NamespacedKey key;
 
-    private GoalKey(Class<T> entityClass, NamespacedKey namespacedKey) {
+    private GoalKey(Class<T> type, NamespacedKey key) {
-        this.entityClass = entityClass;
+        this.type = type;
-        this.namespacedKey = namespacedKey;
+        this.key = key;
     }
 
     public Class<T> getEntityClass() {
-        return this.entityClass;
+        return this.type;
     }
 
     public NamespacedKey getNamespacedKey() {
-        return this.namespacedKey;
+        return this.key;
     }
 
     @Override
     public boolean equals(@Nullable Object o) {
         if (this == o) return true;
         if (o == null || this.getClass() != o.getClass()) return false;
+
         GoalKey<?> goalKey = (GoalKey<?>) o;
-        return Objects.equals(this.entityClass, goalKey.entityClass) &&
+        return Objects.equals(this.type, goalKey.type) &&
-            Objects.equals(this.namespacedKey, goalKey.namespacedKey);
+            Objects.equals(this.key, goalKey.key);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(this.entityClass, this.namespacedKey);
+        return Objects.hash(this.type, this.key);
     }
 
     @Override
     public String toString() {
         return new StringJoiner(", ", GoalKey.class.getSimpleName() + "[", "]")
-            .add("entityClass=" + this.entityClass)
+            .add("type=" + this.type)
-            .add("namespacedKey=" + this.namespacedKey)
+            .add("key=" + this.key)
             .toString();
     }
 
-    public static <A extends Mob> GoalKey<A> of(Class<A> entityClass, NamespacedKey namespacedKey) {
+    public static <A extends Mob> GoalKey<A> of(Class<A> type, NamespacedKey key) {
-        return new GoalKey<>(entityClass, namespacedKey);
+        return new GoalKey<>(type, key);
     }
 }

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

@@ -1,5 +1,6 @@
 package io.papermc.paper;
 
+import io.papermc.paper.command.brigadier.CommandSourceStack;
 import io.papermc.paper.world.damagesource.CombatEntry;
 import io.papermc.paper.world.damagesource.FallLocationType;
 import net.kyori.adventure.util.Services;
@@ -11,6 +12,8 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
+import java.util.function.Predicate;
+
 /**
  * Static bridge to the server internals.
  * <p>
@@ -73,5 +76,15 @@ public interface InternalAPIBridge {
      * @return combat entry
      */
     CombatEntry createCombatEntry(DamageSource damageSource, float damage, @Nullable FallLocationType fallLocationType, float fallDistance);
+
+    /**
+     * Causes this predicate to be considered restricted.
+     * Applying this to a command node prevents this command from being executed from an
+     * unattended context, such as click events.
+     *
+     * @param predicate wrapped predicate
+     * @return wrapped predicate
+     */
+    Predicate<CommandSourceStack> restricted(Predicate<CommandSourceStack> predicate);
 }
 

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

@@ -17,7 +17,8 @@ public enum CommandRegistrationFlag {
     @Deprecated(since = "1.21.4")
     FLATTEN_ALIASES,
     /**
-     * Prevents this command from being sent to the client.
+     * @deprecated Removed as it causes a warning to appear on the client now.
      */
+    @Deprecated(since = "1.21.6", forRemoval = true)
     SERVER_ONLY
 }

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

@@ -5,6 +5,7 @@ import com.mojang.brigadier.arguments.ArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.builder.RequiredArgumentBuilder;
 import com.mojang.brigadier.tree.LiteralCommandNode;
+import io.papermc.paper.InternalAPIBridge;
 import io.papermc.paper.plugin.bootstrap.BootstrapContext;
 import io.papermc.paper.plugin.bootstrap.PluginBootstrap;
 import io.papermc.paper.plugin.configuration.PluginMeta;
@@ -13,6 +14,7 @@ import io.papermc.paper.plugin.lifecycle.event.registrar.Registrar;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Set;
+import java.util.function.Predicate;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Unmodifiable;
 import org.jspecify.annotations.NullMarked;
@@ -85,6 +87,22 @@ public interface Commands extends Registrar {
         return RequiredArgumentBuilder.argument(name, argumentType);
     }
 
+    /**
+     * Creates a restricted {@link Predicate} that wraps the given predicate.
+     * <p>
+     * A restricted predicate prevents execution in unattended contexts, such as from
+     * chat click events. A warning is shown on the client before executing the command.
+     * <p>
+     * This is used by vanilla to prevent invocation of sensitive commands (like op) from
+     * players without their knowledge.
+     *
+     * @param predicate the original predicate to wrap
+     * @return a new predicate with restricted execution behavior
+     */
+    static Predicate<CommandSourceStack> restricted(final Predicate<CommandSourceStack> predicate) {
+        return InternalAPIBridge.get().restricted(predicate);
+    }
+
     /**
      * Gets the underlying {@link CommandDispatcher}.
      *

paper-api/src/main/java/io/papermc/paper/configuration/ServerConfiguration.java

@@ -21,4 +21,13 @@ public interface ServerConfiguration {
      * @return whether the server is in online mode or behind a proxy configured for online mode
      */
     boolean isProxyOnlineMode();
+
+    /**
+     * Gets whether the server is configured to work behind a proxy.
+     * <p>
+     * This returns true if either Velocity or BungeeCord is enabled.
+     *
+     * @return whether the server is configured to work behind a proxy
+     */
+    boolean isProxyEnabled();
 }

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

@@ -3,7 +3,6 @@ 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;
 
 /**
@@ -23,8 +22,8 @@ public interface DataComponentHolder extends DataComponentView {
      * @param <T> value type
      */
     @Utility
-    @org.jetbrains.annotations.ApiStatus.Experimental
+    @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);
+    <T> void setData(final DataComponentType.Valued<T> type, final DataComponentBuilder<T> valueBuilder);
 
     /**
      * Sets the value of the data component type for this holder.
@@ -33,16 +32,16 @@ public interface DataComponentHolder extends DataComponentView {
      * @param value value to set
      * @param <T> value type
      */
-    @org.jetbrains.annotations.ApiStatus.Experimental
+    @ApiStatus.Experimental
-    public <T> void setData(final io.papermc.paper.datacomponent.DataComponentType.@NotNull Valued<T> type, final @NotNull T value);
+    <T> void setData(final DataComponentType.Valued<T> type, final 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
+    @ApiStatus.Experimental
-    public void setData(final io.papermc.paper.datacomponent.DataComponentType.@NotNull NonValued type);
+    void setData(final DataComponentType.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

@@ -364,8 +364,8 @@ public final class DataComponentTypes {
     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");
+    // 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<Frog.Variant> FROG_VARIANT = valued("frog/variant");
     public static final DataComponentType.Valued<Horse.Color> HORSE_VARIANT = valued("horse/variant");
     public static final DataComponentType.Valued<Art> PAINTING_VARIANT = valued("painting/variant");
@@ -376,7 +376,6 @@ public final class DataComponentTypes {
     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) {
         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) {

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

@@ -3,9 +3,8 @@ 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;
+import org.jspecify.annotations.Nullable;
 
 /**
  * This represents a view of a data component holder. No
@@ -23,11 +22,11 @@ public interface DataComponentView {
      * @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
+     * @see #hasData(DataComponentType) for DataComponentType.NonValued
      */
     @Contract(pure = true)
     @ApiStatus.Experimental
-    public <T> @Nullable T getData(final DataComponentType.@NotNull Valued<T> type);
+    <T> @Nullable T getData(final DataComponentType.Valued<T> type);
 
     /**
      * Gets the value for the data component type on this holder with
@@ -41,7 +40,7 @@ public interface DataComponentView {
     @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);
+    <T> @Nullable T getDataOrDefault(final DataComponentType.Valued<? extends T> type, final @Nullable T fallback);
 
     /**
      * Checks if the data component type is set on this holder.
@@ -51,7 +50,7 @@ public interface DataComponentView {
      */
     @Contract(pure = true)
     @ApiStatus.Experimental
-    boolean hasData(final io.papermc.paper.datacomponent.@NotNull DataComponentType type);
+    boolean hasData(final DataComponentType type);
 
     // Not applicable to entities
     // /**
@@ -61,5 +60,5 @@ public interface DataComponentView {
     //  */
     // @Contract("-> new")
     // @ApiStatus.Experimental
-    // java.util.@Unmodifiable Set<io.papermc.paper.datacomponent.@NotNull DataComponentType> getDataTypes();
+    // @Unmodifiable Set<DataComponentType> getDataTypes();
 }

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

@@ -4,13 +4,13 @@ import io.papermc.paper.datacomponent.DataComponentBuilder;
 import io.papermc.paper.datacomponent.item.blocksattacks.DamageReduction;
 import io.papermc.paper.datacomponent.item.blocksattacks.ItemDamageFunction;
 import io.papermc.paper.registry.tag.TagKey;
+import java.util.List;
 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;
-import java.util.List;
 
 /**
  * Holds block attacks to the holding player like Shield.
@@ -62,24 +62,21 @@ public interface BlocksAttacks {
      *
      * @return a damage type tag key, or null if there is no such tag key
      */
-    @Nullable
+    @Nullable TagKey<DamageType> bypassedBy();
-    TagKey<DamageType> bypassedBy();
 
     /**
      * Gets the key sound to play when an attack is successfully blocked.
      *
      * @return a key of the sound
      */
-    @Nullable
+    @Nullable Key blockSound();
-    Key blockSound();
 
     /**
      * Gets the key sound to play when the item goes on its disabled cooldown due to an attack.
      *
      * @return a key of the sound
      */
-    @Nullable
+    @Nullable Key disableSound();
-    Key disableSound();
 
     /**
      * Builder for {@link BlocksAttacks}.

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

@@ -1,7 +1,7 @@
 package io.papermc.paper.datacomponent.item;
 
-import java.util.List;
 import io.papermc.paper.datacomponent.DataComponentBuilder;
+import java.util.List;
 import org.bukkit.Color;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;

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

@@ -104,6 +104,22 @@ public interface Equippable extends BuildableDataComponent<Equippable, Equippabl
     @Contract(pure = true)
     boolean equipOnInteract();
 
+    /**
+     * Checks if the item can be sheared off an entity.
+     *
+     * @return true if can be sheared off an entity, false otherwise
+     */
+    @Contract(pure = true)
+    boolean canBeSheared();
+
+    /**
+     * Returns the sound that is played when shearing this equipment off an entity.
+     *
+     * @return shear sound
+     */
+    @Contract(pure = true)
+    Key shearSound();
+
     /**
      * Builder for {@link Equippable}.
      */
@@ -182,5 +198,23 @@ public interface Equippable extends BuildableDataComponent<Equippable, Equippabl
          */
         @Contract(value = "_ -> this", mutates = "this")
         Builder equipOnInteract(boolean equipOnInteract);
+
+        /**
+         * Sets whether the item can be sheared off an entity.
+         *
+         * @param canBeSheared true if can be sheared off an entity
+         * @return the builder for chaining
+         */
+        @Contract(value = "_ -> this", mutates = "this")
+        Builder canBeSheared(boolean canBeSheared);
+
+        /**
+         * Sets the sound that is played when shearing this equipment off an entity.
+         *
+         * @param shearSound the shear sound key
+         * @return the builder for chaining
+         */
+        @Contract(value = "_ -> this", mutates = "this")
+        Builder shearSound(Key shearSound);
     }
 }

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

@@ -1,7 +1,6 @@
 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;

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

@@ -1,6 +1,7 @@
 package io.papermc.paper.datacomponent.item;
 
 import io.papermc.paper.datacomponent.DataComponentBuilder;
+import io.papermc.paper.datacomponent.item.attribute.AttributeModifierDisplay;
 import java.util.List;
 import org.bukkit.attribute.Attribute;
 import org.bukkit.attribute.AttributeModifier;
@@ -55,13 +56,21 @@ public interface ItemAttributeModifiers {
         AttributeModifier modifier();
 
         /**
-         * Gets the slot group for this attribute.
+         * Gets the slot group for the paired attribute.
          *
          * @return the slot group
          */
         default EquipmentSlotGroup getGroup() {
             return this.modifier().getSlotGroup();
         }
+
+        /**
+         * The display behavior for the attribute modifier.
+         *
+         * @return the display behavior
+         */
+        @Contract(pure = true)
+        AttributeModifierDisplay display();
     }
 
     /**
@@ -74,24 +83,55 @@ public interface ItemAttributeModifiers {
         /**
          * Adds a modifier to this builder.
          *
-         * @param attribute attribute
+         * @param attribute the attribute
-         * @param modifier  modifier
+         * @param modifier  the modifier
          * @return the builder for chaining
          * @see #modifiers()
          */
         @Contract(value = "_, _ -> this", mutates = "this")
-        Builder addModifier(Attribute attribute, AttributeModifier modifier);
+        default Builder addModifier(Attribute attribute, AttributeModifier modifier) {
+            return this.addModifier(attribute, modifier, modifier.getSlotGroup());
+        }
 
         /**
          * Adds a modifier to this builder.
          *
-         * @param attribute          attribute
+         * @param attribute          the attribute
-         * @param modifier           modifier
+         * @param modifier           the modifier
          * @param equipmentSlotGroup the slot group this modifier applies to (overrides any slot group in the modifier)
          * @return the builder for chaining
          * @see #modifiers()
          */
         @Contract(value = "_, _, _ -> this", mutates = "this")
-        Builder addModifier(Attribute attribute, AttributeModifier modifier, EquipmentSlotGroup equipmentSlotGroup);
+        default Builder addModifier(Attribute attribute, AttributeModifier modifier, EquipmentSlotGroup equipmentSlotGroup) {
+            return this.addModifier(attribute, modifier, equipmentSlotGroup, AttributeModifierDisplay.reset());
+        }
+
+        /**
+         * Adds a modifier to this builder.
+         *
+         * @param attribute          the attribute
+         * @param modifier           the modifier
+         * @param display            the modifier display behavior
+         * @return the builder for chaining
+         * @see #modifiers()
+         */
+        @Contract(value = "_, _, _ -> this", mutates = "this")
+        default Builder addModifier(Attribute attribute, AttributeModifier modifier, AttributeModifierDisplay display) {
+            return this.addModifier(attribute, modifier, modifier.getSlotGroup(), display);
+        }
+
+        /**
+         * Adds a modifier to this builder.
+         *
+         * @param attribute          the attribute
+         * @param modifier           the modifier
+         * @param equipmentSlotGroup the slot group this modifier applies to (overrides any slot group in the modifier)
+         * @param display            the modifier display behavior
+         * @return the builder for chaining
+         * @see #modifiers()
+         */
+        @Contract(value = "_, _, _, _ -> this", mutates = "this")
+        Builder addModifier(Attribute attribute, AttributeModifier modifier, EquipmentSlotGroup equipmentSlotGroup, AttributeModifierDisplay display);
     }
 }

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

@@ -90,7 +90,7 @@ interface ItemComponentTypesBridge {
 
     MapId mapId(int id);
 
-    UseRemainder useRemainder(ItemStack itemStack);
+    UseRemainder useRemainder(ItemStack stack);
 
     Consumable.Builder consumable();
 

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

@@ -0,0 +1,85 @@
+package io.papermc.paper.datacomponent.item.attribute;
+
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.ComponentLike;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Contract;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * The display behavior for a dedicated attribute entry.
+ *
+ * @see io.papermc.paper.datacomponent.DataComponentTypes#ATTRIBUTE_MODIFIERS
+ * @see io.papermc.paper.datacomponent.item.ItemAttributeModifiers#itemAttributes()
+ */
+@NullMarked
+@ApiStatus.Experimental
+@ApiStatus.NonExtendable
+public interface AttributeModifierDisplay {
+
+    /**
+     * Reset any override of the text displayed by the attribute modifier
+     * to its default behavior displaying the statistics.
+     *
+     * @return the new display behavior instance
+     */
+    @Contract(value = "-> new", pure = true)
+    static Default reset() {
+        return AttributeModifierDisplayBridge.bridge().reset();
+    }
+
+    /**
+     * Hides the statistics displayed by the attribute modifier.
+     *
+     * @return the new display behavior instance
+     */
+    @Contract(value = "-> new", pure = true)
+    static Hidden hidden() {
+        return AttributeModifierDisplayBridge.bridge().hidden();
+    }
+
+    /**
+     * Override the statistics displayed by the attribute modifier
+     * to an arbitrary text.
+     *
+     * @param text the overridden text
+     * @return the new display behavior instance
+     */
+    @Contract(value = "_ -> new", pure = true)
+    static OverrideText override(final ComponentLike text) {
+        return AttributeModifierDisplayBridge.bridge().override(text);
+    }
+
+    /**
+     * Hidden statistics display for the attribute modifier.
+     */
+    @ApiStatus.Experimental
+    @ApiStatus.NonExtendable
+    interface Hidden extends AttributeModifierDisplay {
+    }
+
+    /**
+     * Default display for the attribute modifier, showing
+     * the statistic of its effect.
+     */
+    @ApiStatus.Experimental
+    @ApiStatus.NonExtendable
+    interface Default extends AttributeModifierDisplay {
+    }
+
+    /**
+     * Specifies an overridden text to show instead of
+     * the default behavior for the attribute modifier.
+     */
+    @ApiStatus.Experimental
+    @ApiStatus.NonExtendable
+    interface OverrideText extends AttributeModifierDisplay {
+
+        /**
+         * Overridden text
+         *
+         * @return the overridden text
+         */
+        Component text();
+    }
+}

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

@@ -0,0 +1,24 @@
+package io.papermc.paper.datacomponent.item.attribute;
+
+import java.util.Optional;
+import java.util.ServiceLoader;
+import net.kyori.adventure.text.ComponentLike;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+@NullMarked
+@ApiStatus.Internal
+interface AttributeModifierDisplayBridge {
+
+    Optional<AttributeModifierDisplayBridge> BRIDGE = ServiceLoader.load(AttributeModifierDisplayBridge.class).findFirst();
+
+    static AttributeModifierDisplayBridge bridge() {
+        return BRIDGE.orElseThrow();
+    }
+
+    AttributeModifierDisplay.Default reset();
+
+    AttributeModifierDisplay.Hidden hidden();
+
+    AttributeModifierDisplay.OverrideText override(ComponentLike text);
+}

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

@@ -1,9 +1,9 @@
 package io.papermc.paper.datacomponent.item.blocksattacks;
 
-import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;
 import java.util.Optional;
 import java.util.ServiceLoader;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
 
 @NullMarked
 @ApiStatus.Internal

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

@@ -30,16 +30,14 @@ public interface DamageReduction {
      *
      * @return the set of damage type
      */
-    @Nullable
+    @Nullable RegistryKeySet<DamageType> type();
-    RegistryKeySet<DamageType> type();
 
     /**
      * Get the maximum angle between the users facing direction and the direction of the incoming attack to be blocked.
      *
      * @return the angle
      */
-    @Positive
+    @Positive float horizontalBlockingAngle();
-    float horizontalBlockingAngle();
 
     /**
      * Get the constant amount of damage to be blocked.

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

@@ -1,11 +1,14 @@
 package io.papermc.paper.datacomponent.item.consumable;
 
+import org.jetbrains.annotations.ApiStatus;
+
 /**
  * Represents the hand animation that is used when a player is consuming this item.
  */
+@ApiStatus.Experimental
 public enum ItemUseAnimation {
     // Start generate - ItemUseAnimation
-    // @GeneratedFrom 1.21.5
+    // @GeneratedFrom 1.21.6
     NONE,
     EAT,
     DRINK,

paper-api/src/main/java/io/papermc/paper/plugin/PermissionManager.java

@@ -157,7 +157,7 @@ public interface PermissionManager {
     void addPermissions(List<Permission> perm);
 
     /**
-     * Clears the current registered permissinos.
+     * Clears all the current registered permissions.
      * <p>
      * This is used for reloading.
      */

paper-api/src/main/java/io/papermc/paper/plugin/configuration/package-info.java

@@ -1,8 +1,7 @@
 /**
  * The paper configuration package contains the new java representation of a plugins configuration file.
  * While most values are described in detail on {@link io.papermc.paper.plugin.configuration.PluginMeta}, a full
- * entry on the paper contains a full and extensive example of possible configurations of the paper-plugin.yml.
+ * entry on the paper website contains a full and extensive example of possible configurations of the paper-plugin.yml.
- * @see <a href="https://docs.papermc.io/paper">Extensive documentation and examples of the paper-plugin.yml</a>
+ * @see <a href="https://docs.papermc.io/paper/dev/getting-started/paper-plugins">Extensive documentation and examples of the paper-plugin.yml</a>
- * <!--TODO update the documentation link once documentation for this exists and is deployed-->
  */
 package io.papermc.paper.plugin.configuration;

paper-api/src/main/java/io/papermc/paper/plugin/lifecycle/event/LifecycleEvent.java

@@ -11,7 +11,6 @@ import org.jetbrains.annotations.ApiStatus;
  * server initialization.
  * @see LifecycleEvents
  */
-@ApiStatus.Experimental
 @ApiStatus.NonExtendable
 public interface LifecycleEvent {
 }

paper-api/src/main/java/io/papermc/paper/plugin/lifecycle/event/LifecycleEventManager.java

@@ -4,7 +4,6 @@ import io.papermc.paper.plugin.lifecycle.event.handler.LifecycleEventHandler;
 import io.papermc.paper.plugin.lifecycle.event.handler.configuration.LifecycleEventHandlerConfiguration;
 import io.papermc.paper.plugin.lifecycle.event.types.LifecycleEventType;
 import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Manages a plugin's lifecycle events. Can be obtained
@@ -12,8 +11,6 @@ import org.jspecify.annotations.NullMarked;
  *
  * @param <O> the owning type, {@link org.bukkit.plugin.Plugin} or {@link io.papermc.paper.plugin.bootstrap.BootstrapContext}
  */
-@ApiStatus.Experimental
-@NullMarked
 @ApiStatus.NonExtendable
 public interface LifecycleEventManager<O extends LifecycleEventOwner> {
 

paper-api/src/main/java/io/papermc/paper/plugin/lifecycle/event/LifecycleEventOwner.java

@@ -2,7 +2,6 @@ package io.papermc.paper.plugin.lifecycle.event;
 
 import io.papermc.paper.plugin.configuration.PluginMeta;
 import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Implemented by types that are considered owners
@@ -11,8 +10,6 @@ import org.jspecify.annotations.NullMarked;
  * a {@link LifecycleEventManager} where you can register
  * event handlers.
  */
-@ApiStatus.Experimental
-@NullMarked
 @ApiStatus.NonExtendable
 public interface LifecycleEventOwner {
 

paper-api/src/main/java/io/papermc/paper/plugin/lifecycle/event/handler/LifecycleEventHandler.java

@@ -1,8 +1,6 @@
 package io.papermc.paper.plugin.lifecycle.event.handler;
 
 import io.papermc.paper.plugin.lifecycle.event.LifecycleEvent;
-import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * A handler for a specific event. Can be implemented
@@ -10,8 +8,6 @@ import org.jspecify.annotations.NullMarked;
  *
  * @param <E> the event
  */
-@ApiStatus.Experimental
-@NullMarked
 @FunctionalInterface
 public interface LifecycleEventHandler<E extends LifecycleEvent> {
 

paper-api/src/main/java/io/papermc/paper/plugin/lifecycle/event/handler/configuration/LifecycleEventHandlerConfiguration.java

@@ -3,7 +3,6 @@ package io.papermc.paper.plugin.lifecycle.event.handler.configuration;
 import io.papermc.paper.plugin.lifecycle.event.LifecycleEventOwner;
 import io.papermc.paper.plugin.lifecycle.event.handler.LifecycleEventHandler;
 import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Base type for constructing configured event handlers for
@@ -13,8 +12,6 @@ import org.jspecify.annotations.NullMarked;
  * @param <O>
  */
 @SuppressWarnings("unused")
-@ApiStatus.Experimental
-@NullMarked
 @ApiStatus.NonExtendable
 public interface LifecycleEventHandlerConfiguration<O extends LifecycleEventOwner> {
 }

paper-api/src/main/java/io/papermc/paper/plugin/lifecycle/event/handler/configuration/MonitorLifecycleEventHandlerConfiguration.java

@@ -3,15 +3,12 @@ package io.papermc.paper.plugin.lifecycle.event.handler.configuration;
 import io.papermc.paper.plugin.lifecycle.event.LifecycleEventOwner;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Handler configuration for event types that allow "monitor" handlers.
  *
  * @param <O> the required owner type
  */
-@ApiStatus.Experimental
-@NullMarked
 @ApiStatus.NonExtendable
 public interface MonitorLifecycleEventHandlerConfiguration<O extends LifecycleEventOwner> extends LifecycleEventHandlerConfiguration<O> {
 

paper-api/src/main/java/io/papermc/paper/plugin/lifecycle/event/handler/configuration/PrioritizedLifecycleEventHandlerConfiguration.java

@@ -3,7 +3,6 @@ package io.papermc.paper.plugin.lifecycle.event.handler.configuration;
 import io.papermc.paper.plugin.lifecycle.event.LifecycleEventOwner;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Handler configuration that allows both "monitor" and prioritized handlers.
@@ -11,8 +10,6 @@ import org.jspecify.annotations.NullMarked;
  *
  * @param <O> the required owner type
  */
-@ApiStatus.Experimental
-@NullMarked
 @ApiStatus.NonExtendable
 public interface PrioritizedLifecycleEventHandlerConfiguration<O extends LifecycleEventOwner> extends LifecycleEventHandlerConfiguration<O> {
 

paper-api/src/main/java/io/papermc/paper/plugin/lifecycle/event/handler/configuration/package-info.java

@@ -0,0 +1,6 @@
+@ApiStatus.Experimental
+@NullMarked
+package io.papermc.paper.plugin.lifecycle.event.handler.configuration;
+
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;

paper-api/src/main/java/io/papermc/paper/plugin/lifecycle/event/handler/package-info.java

@@ -0,0 +1,6 @@
+@ApiStatus.Experimental
+@NullMarked
+package io.papermc.paper.plugin.lifecycle.event.handler;
+
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;

paper-api/src/main/java/io/papermc/paper/plugin/lifecycle/event/package-info.java

@@ -0,0 +1,6 @@
+@ApiStatus.Experimental
+@NullMarked
+package io.papermc.paper.plugin.lifecycle.event;
+
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;

paper-api/src/main/java/io/papermc/paper/plugin/lifecycle/event/registrar/Registrar.java

@@ -6,7 +6,6 @@ import org.jetbrains.annotations.ApiStatus;
  * To be implemented by types that provide ways to register types
  * either on server start or during a reload
  */
-@ApiStatus.Experimental
 @ApiStatus.NonExtendable
 public interface Registrar {
 }

paper-api/src/main/java/io/papermc/paper/plugin/lifecycle/event/registrar/RegistrarEvent.java

@@ -3,7 +3,6 @@ package io.papermc.paper.plugin.lifecycle.event.registrar;
 import io.papermc.paper.plugin.lifecycle.event.LifecycleEvent;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * A lifecycle event that exposes a {@link Registrar} of some kind
@@ -13,8 +12,6 @@ import org.jspecify.annotations.NullMarked;
  * @param <R> registrar type
  * @see ReloadableRegistrarEvent
  */
-@ApiStatus.Experimental
-@NullMarked
 @ApiStatus.NonExtendable
 public interface RegistrarEvent<R extends Registrar> extends LifecycleEvent {
 

paper-api/src/main/java/io/papermc/paper/plugin/lifecycle/event/registrar/ReloadableRegistrarEvent.java

@@ -2,7 +2,6 @@ package io.papermc.paper.plugin.lifecycle.event.registrar;
 
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * A lifecycle event that exposes a {@link Registrar} that is
@@ -11,8 +10,6 @@ import org.jspecify.annotations.NullMarked;
  * @param <R> the registrar type
  * @see RegistrarEvent
  */
-@ApiStatus.Experimental
-@NullMarked
 @ApiStatus.NonExtendable
 public interface ReloadableRegistrarEvent<R extends Registrar> extends RegistrarEvent<R> {
 
@@ -24,7 +21,6 @@ public interface ReloadableRegistrarEvent<R extends Registrar> extends Registrar
     @Contract(pure = true)
     Cause cause();
 
-    @ApiStatus.Experimental
     enum Cause {
         /**
          * The initial load of the server.

paper-api/src/main/java/io/papermc/paper/plugin/lifecycle/event/registrar/package-info.java

@@ -0,0 +1,6 @@
+@ApiStatus.Experimental
+@NullMarked
+package io.papermc.paper.plugin.lifecycle.event.registrar;
+
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;

paper-api/src/main/java/io/papermc/paper/plugin/lifecycle/event/types/LifecycleEventType.java

@@ -9,7 +9,6 @@ import io.papermc.paper.plugin.lifecycle.event.handler.configuration.MonitorLife
 import io.papermc.paper.plugin.lifecycle.event.handler.configuration.PrioritizedLifecycleEventHandlerConfiguration;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Base type for all types of lifecycle events. Differs from
@@ -22,8 +21,6 @@ import org.jspecify.annotations.NullMarked;
  * @param <E> the event object type
  * @param <C> the configuration type
  */
-@ApiStatus.Experimental
-@NullMarked
 @ApiStatus.NonExtendable
 public interface LifecycleEventType<O extends LifecycleEventOwner, E extends LifecycleEvent, C extends LifecycleEventHandlerConfiguration<O>> {
 
@@ -55,7 +52,6 @@ public interface LifecycleEventType<O extends LifecycleEventOwner, E extends Lif
      * @param <O> the required owner type
      * @param <E> the event object type
      */
-    @ApiStatus.Experimental
     @ApiStatus.NonExtendable
     interface Monitorable<O extends LifecycleEventOwner, E extends LifecycleEvent> extends LifecycleEventType<O, E, MonitorLifecycleEventHandlerConfiguration<O>> {
     }
@@ -67,7 +63,6 @@ public interface LifecycleEventType<O extends LifecycleEventOwner, E extends Lif
      * @param <O> the required owner type
      * @param <E> the event object type
      */
-    @ApiStatus.Experimental
     @ApiStatus.NonExtendable
     interface Prioritizable<O extends LifecycleEventOwner, E extends LifecycleEvent> extends LifecycleEventType<O, E, PrioritizedLifecycleEventHandlerConfiguration<O>> {
     }

paper-api/src/main/java/io/papermc/paper/plugin/lifecycle/event/types/LifecycleEventTypeProvider.java

@@ -5,10 +5,8 @@ import io.papermc.paper.plugin.lifecycle.event.LifecycleEventOwner;
 import java.util.Optional;
 import java.util.ServiceLoader;
 import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;
 
 @ApiStatus.Internal
-@NullMarked
 interface LifecycleEventTypeProvider {
 
     Optional<LifecycleEventTypeProvider> INSTANCE = ServiceLoader.load(LifecycleEventTypeProvider.class)

paper-api/src/main/java/io/papermc/paper/plugin/lifecycle/event/types/LifecycleEvents.java

@@ -10,15 +10,12 @@ import io.papermc.paper.plugin.lifecycle.event.registrar.RegistrarEvent;
 import io.papermc.paper.plugin.lifecycle.event.registrar.ReloadableRegistrarEvent;
 import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Holds various types of lifecycle events for
  * use when creating event handler configurations
  * in {@link LifecycleEventManager}.
  */
-@ApiStatus.Experimental
-@NullMarked
 public final class LifecycleEvents {
 
     /**

paper-api/src/main/java/io/papermc/paper/plugin/lifecycle/event/types/TagEventTypeProvider.java

@@ -6,7 +6,6 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.tag.PostFlattenTagRegistrar;
 import io.papermc.paper.tag.PreFlattenTagRegistrar;
 import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Provides event types for tag registration.
@@ -14,8 +13,6 @@ import org.jspecify.annotations.NullMarked;
  * @see PreFlattenTagRegistrar
  * @see PostFlattenTagRegistrar
  */
-@ApiStatus.Experimental
-@NullMarked
 @ApiStatus.NonExtendable
 public interface TagEventTypeProvider {
 

paper-api/src/main/java/io/papermc/paper/plugin/lifecycle/event/types/package-info.java

@@ -0,0 +1,6 @@
+@ApiStatus.Experimental
+@NullMarked
+package io.papermc.paper.plugin.lifecycle.event.types;
+
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;

paper-api/src/main/java/io/papermc/paper/plugin/loader/library/impl/MavenLibraryResolver.java

@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
  * MavenLibraryResolver resolver = new MavenLibraryResolver();
  * resolver.addDependency(new Dependency(new DefaultArtifact("org.jooq:jooq:3.17.7"), null));
  * resolver.addRepository(new RemoteRepository.Builder(
- *     "central", "default", "https://repo1.maven.org/maven2/"
+ *     "central", "default", MavenLibraryResolver.MAVEN_CENTRAL_DEFAULT_MIRROR
  * ).build());
  * }</pre>
  * <p>
@@ -50,6 +50,21 @@ import org.slf4j.LoggerFactory;
 @NullMarked
 public class MavenLibraryResolver implements ClassPathLibrary {
 
+    /**
+     * The default Maven Central mirror, configurable through the {@code PAPER_DEFAULT_CENTRAL_REPOSITORY} environment
+     * variable. Use this instead of Maven Central directly when you do not have your own mirror, as using
+     * Maven Central as a CDN is against the Maven Central Terms of Service, and you will cause users to hit
+     * rate limits.
+     *
+     * <p>This repository is also used by the legacy {@link org.bukkit.plugin.java.LibraryLoader}.</p>
+     */
+    public static final String MAVEN_CENTRAL_DEFAULT_MIRROR = getDefaultMavenCentralMirror();
+    private static final List<String> MAVEN_CENTRAL_URLS = List.of(
+        "https://repo1.maven.org/maven2",
+        "http://repo1.maven.org/maven2",
+        "https://repo.maven.apache.org/maven2",
+        "http://repo.maven.apache.org/maven2"
+    );
     private static final Logger LOGGER = LoggerFactory.getLogger("MavenLibraryResolver");
 
     private final RepositorySystem repository;
@@ -105,6 +120,12 @@ public class MavenLibraryResolver implements ClassPathLibrary {
      * dependencies from
      */
     public void addRepository(final RemoteRepository remoteRepository) {
+        if (MAVEN_CENTRAL_URLS.stream().anyMatch(remoteRepository.getUrl()::startsWith)) {
+            LOGGER.warn(
+                "Use of Maven Central as a CDN is against the Maven Central Terms of Service. Use MavenLibraryResolver.MAVEN_CENTRAL_DEFAULT_MIRROR instead.",
+                new RuntimeException("Plugin used Maven Central for library resolution")
+            );
+        }
         this.repositories.add(remoteRepository);
     }
 
@@ -130,4 +151,15 @@ public class MavenLibraryResolver implements ClassPathLibrary {
             store.addLibrary(file.toPath());
         }
     }
+
+    private static String getDefaultMavenCentralMirror() {
+        String central = System.getenv("PAPER_DEFAULT_CENTRAL_REPOSITORY");
+        if (central == null) {
+            central = System.getProperty("org.bukkit.plugin.java.LibraryLoader.centralURL");
+        }
+        if (central == null) {
+            central = "https://maven-central.storage-download.googleapis.com/maven2";
+        }
+        return central;
+    }
 }

paper-api/src/main/java/io/papermc/paper/plugin/provider/util/ProviderUtil.java

@@ -4,6 +4,8 @@ import com.destroystokyo.paper.util.SneakyThrow;
 import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InaccessibleObjectException;
 
 /**
  * An <b>internal</b> utility type that holds logic for loading a provider-like type from a classloaders.
@@ -56,7 +58,14 @@ public final class ProviderUtil {
                     throw new ClassCastException("class '%s' does not extend '%s'".formatted(clazz, classType));
                 }
 
-                clazzInstance = pluginClass.getDeclaredConstructor().newInstance();
+                final Constructor<? extends T> constructor = pluginClass.getDeclaredConstructor();
+                try {
+                    constructor.setAccessible(true); // Allow non-public constructors
+                } catch (final InaccessibleObjectException | SecurityException ex) {
+                    throw new RuntimeException("Inaccessible constructor");
+                }
+
+                clazzInstance = constructor.newInstance();
             } catch (final IllegalAccessException exception) {
                 throw new RuntimeException("No public constructor");
             } catch (final InstantiationException exception) {

paper-api/src/main/java/io/papermc/paper/registry/RegistryKey.java

@@ -76,16 +76,14 @@ public sealed interface RegistryKey<T> extends Keyed permits RegistryKeyImpl {
      */
     RegistryKey<PotionEffectType> MOB_EFFECT = create("mob_effect");
     /**
-     * @apiNote DO NOT USE
+     * Built-in registry for block types.
+     * @see io.papermc.paper.registry.keys.BlockTypeKeys
      */
-    @ApiStatus.Internal
     RegistryKey<BlockType> BLOCK = create("block");
     /**
-     * @apiNote use preferably only in the context of registry entries.
+     * Built-in registry for item types.
-     * @see io.papermc.paper.registry.data
      * @see io.papermc.paper.registry.keys.ItemTypeKeys
      */
-    @ApiStatus.Experimental // Paper - already required for registry builders
     RegistryKey<ItemType> ITEM = create("item");
     /**
      * Built-in registry for villager professions.

paper-api/src/main/java/io/papermc/paper/registry/TypedKeyImpl.java

@@ -1,16 +1,19 @@
 package io.papermc.paper.registry;
 
 import net.kyori.adventure.key.Key;
+import net.kyori.adventure.key.KeyPattern;
 import org.jspecify.annotations.NullMarked;
 
 @NullMarked
 record TypedKeyImpl<T>(Key key, RegistryKey<T> registryKey) implements TypedKey<T> {
     // Wrap key methods to make this easier to use
+    @KeyPattern.Namespace
     @Override
     public String namespace() {
         return this.key.namespace();
     }
 
+    @KeyPattern.Value
     @Override
     public String value() {
         return this.key.value();

paper-api/src/main/java/io/papermc/paper/registry/data/EnchantmentRegistryEntry.java

@@ -3,6 +3,7 @@ package io.papermc.paper.registry.data;
 import io.papermc.paper.registry.RegistryBuilder;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
+import io.papermc.paper.registry.event.RegistryComposeEvent;
 import io.papermc.paper.registry.set.RegistryKeySet;
 import io.papermc.paper.registry.set.RegistrySet;
 import io.papermc.paper.registry.tag.TagKey;
@@ -153,7 +154,7 @@ public interface EnchantmentRegistryEntry {
         /**
          * Configures the set of supported items this enchantment can be applied on. This
          * can be a {@link RegistryKeySet} created via {@link RegistrySet#keySet(io.papermc.paper.registry.RegistryKey, Iterable)} or
-         * a tag obtained via {@link io.papermc.paper.registry.event.RegistryFreezeEvent#getOrCreateTag(TagKey)} with
+         * a tag obtained via {@link RegistryComposeEvent#getOrCreateTag(TagKey)} with
          * tag keys found in {@link io.papermc.paper.registry.keys.tags.ItemTypeTagKeys} such as
          * {@link io.papermc.paper.registry.keys.tags.ItemTypeTagKeys#ENCHANTABLE_ARMOR} and
          * {@link io.papermc.paper.registry.keys.tags.ItemTypeTagKeys#ENCHANTABLE_SWORD}.
@@ -161,7 +162,7 @@ public interface EnchantmentRegistryEntry {
          * @param supportedItems the registry key set representing the supported items.
          * @return this builder instance.
          * @see RegistrySet#keySet(RegistryKey, TypedKey[])
-         * @see io.papermc.paper.registry.event.RegistryFreezeEvent#getOrCreateTag(TagKey)
+         * @see RegistryComposeEvent#getOrCreateTag(TagKey)
          */
         @Contract(value = "_ -> this", mutates = "this")
         Builder supportedItems(RegistryKeySet<ItemType> supportedItems);
@@ -170,7 +171,7 @@ public interface EnchantmentRegistryEntry {
          * Configures a set of item types this enchantment can naturally be applied to, when enchanting in an
          * enchantment table.This can be a {@link RegistryKeySet} created via
          * {@link RegistrySet#keySet(io.papermc.paper.registry.RegistryKey, Iterable)} or a tag obtained via
-         * {@link io.papermc.paper.registry.event.RegistryFreezeEvent#getOrCreateTag(TagKey)} with
+         * {@link RegistryComposeEvent#getOrCreateTag(TagKey)} with
          * tag keys found in {@link io.papermc.paper.registry.keys.tags.ItemTypeTagKeys} such as
          * {@link io.papermc.paper.registry.keys.tags.ItemTypeTagKeys#ENCHANTABLE_ARMOR} and
          * {@link io.papermc.paper.registry.keys.tags.ItemTypeTagKeys#ENCHANTABLE_SWORD}.
@@ -182,7 +183,7 @@ public interface EnchantmentRegistryEntry {
          * @param primaryItems the registry key set representing the primary items.
          * @return this builder instance.
          * @see RegistrySet#keySet(RegistryKey, TypedKey[])
-         * @see io.papermc.paper.registry.event.RegistryFreezeEvent#getOrCreateTag(TagKey)
+         * @see RegistryComposeEvent#getOrCreateTag(TagKey)
          */
         @Contract(value = "_ -> this", mutates = "this")
         Builder primaryItems(@Nullable RegistryKeySet<ItemType> primaryItems);
@@ -285,7 +286,7 @@ public interface EnchantmentRegistryEntry {
          * @param exclusiveWith a registry set of enchantments exclusive to this one.
          * @return this builder instance.
          * @see RegistrySet#keySet(RegistryKey, TypedKey[])
-         * @see io.papermc.paper.registry.event.RegistryFreezeEvent#getOrCreateTag(TagKey)
+         * @see RegistryComposeEvent#getOrCreateTag(TagKey)
          */
         @Contract(value = "_ -> this", mutates = "this")
         Builder exclusiveWith(RegistryKeySet<Enchantment> exclusiveWith);

paper-api/src/main/java/io/papermc/paper/registry/data/InlinedRegistryBuilderProvider.java

@@ -18,5 +18,4 @@ public interface InlinedRegistryBuilderProvider {
         return Holder.INSTANCE.orElseThrow();
     }
 
-    Art createPaintingVariant(Consumer<RegistryBuilderFactory<Art, ? extends PaintingVariantRegistryEntry.Builder>> value);
 }