Remove Pre-Load of CrashReport and ObfHelper

.editorconfig

@@ -1,5 +1,3 @@
-root = true
-
 [*]
 charset=utf-8
 end_of_line=lf
@@ -42,5 +40,5 @@ ij_java_use_fq_class_names = true
 [paper-server/src/minecraft/resources/data/**/*.json]
 indent_size = 2
 
-[paper-{server,api}/src/generated/java/**/*.java]
+[paper-api-generator/generated/**/*.java]
 ij_java_imports_layout = $*,|,*

.github/workflows/build.yml

@@ -19,39 +19,34 @@ 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 publish-pr flag.
+    # 3. Run on labeled PRs that have the build-pr-jar 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 == 'publish-pr')
+        || (github.event_name == 'pull_request' && github.event.action == 'labeled' && github.event.label.name == 'build-pr-jar')
       )
 
     runs-on: ubuntu-latest
     strategy:
+      matrix:
+        java: [21]
       fail-fast: true
     steps:
       - if: ${{ github.event_name == 'push' }}
         uses: actions/checkout@v4
-        with:
-          # todo remove me again after the update
-          ref: ${{ github.ref_name }}
-          fetch-depth: 0
       - if: ${{ github.event_name == 'pull_request' }}
         uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.sha }}
-      - name: JDK 21
+      - name: JDK ${{ matrix.java }}
         uses: actions/setup-java@v4
         with:
-          java-version: 21
+          java-version: ${{ matrix.java }}
           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
@@ -74,14 +69,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 === "publish-pr"));
+              const pull = pulls.find((pr) => !!pr.labels.find((l) => l.name === "build-pr-jar"));
               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 === "publish-pr")) {
+            } else if (event_name === "pull_request" && event.pull_request.labels.find((l) => l.name === "build-pr-jar")) {
               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)})`);
@@ -103,7 +98,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: Test Results
+          name: Test Results (${{ matrix.java }})
           path: |
             **/build/test-results/test/TEST-*.xml
 
@@ -117,13 +112,6 @@ 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

@@ -0,0 +1,84 @@
+# 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/projects.yml

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

.github/workflows/publish_pr.yml

@@ -1,36 +0,0 @@
-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,14 +21,12 @@ jobs:
         uses: dawidd6/action-download-artifact@v6
         with:
           run_id: ${{ github.event.workflow_run.id }}
-          path: test_artifacts
+          path: 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: test_artifacts/Event File/event.json
+          event_file: artifacts/Event File/event.json
           event_name: ${{ github.event.workflow_run.event }}
-          files: "test_artifacts/**/*.xml"
+          files: "artifacts/**/*.xml"
           comment_mode: off

.gitignore

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

CONTRIBUTING.md

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

README.md

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

build-data/paper.at

@@ -15,10 +15,14 @@ public net.minecraft.commands.CommandSourceStack source
 public net.minecraft.commands.arguments.DimensionArgument ERROR_INVALID_VALUE
 public net.minecraft.commands.arguments.blocks.BlockInput tag
 public net.minecraft.core.MappedRegistry validateWrite(Lnet/minecraft/resources/ResourceKey;)V
-public net.minecraft.nbt.ListTag <init>(Ljava/util/List;)V
+public net.minecraft.nbt.ListTag <init>(Ljava/util/List;B)V
-public net.minecraft.nbt.ListTag identifyRawElementType()B
+public net.minecraft.nbt.TagParser readArrayTag()Lnet/minecraft/nbt/Tag;
+public net.minecraft.nbt.TagParser type(Ljava/lang/String;)Lnet/minecraft/nbt/Tag;
 public net.minecraft.network.Connection address
 public net.minecraft.network.Connection channel
+public net.minecraft.network.chat.HoverEvent$ItemStackInfo components
+public net.minecraft.network.chat.HoverEvent$ItemStackInfo count
+public net.minecraft.network.chat.HoverEvent$ItemStackInfo item
 public net.minecraft.network.chat.TextColor name
 public net.minecraft.network.chat.contents.TranslatableContents filterAllowedArguments(Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
 public net.minecraft.network.chat.numbers.FixedFormat value
@@ -33,10 +37,9 @@ public net.minecraft.network.protocol.game.ServerboundMovePlayerPacket xRot
 public net.minecraft.network.protocol.game.ServerboundMovePlayerPacket y
 public net.minecraft.network.protocol.game.ServerboundMovePlayerPacket yRot
 public net.minecraft.network.protocol.game.ServerboundMovePlayerPacket z
-public net.minecraft.network.syncher.SynchedEntityData getItem(Lnet/minecraft/network/syncher/EntityDataAccessor;)Lnet/minecraft/network/syncher/SynchedEntityData$DataItem;
 public net.minecraft.resources.RegistryOps lookupProvider
 public net.minecraft.resources.RegistryOps$HolderLookupAdapter
-public net.minecraft.server.Main forceUpgrade(Lnet/minecraft/world/level/storage/LevelStorageSource$LevelStorageAccess;Lnet/minecraft/world/level/storage/WorldData;Lcom/mojang/datafixers/DataFixer;ZLjava/util/function/BooleanSupplier;Lnet/minecraft/core/RegistryAccess;Z)V
+public net.minecraft.server.Main forceUpgrade(Lnet/minecraft/world/level/storage/LevelStorageSource$LevelStorageAccess;Lcom/mojang/datafixers/DataFixer;ZLjava/util/function/BooleanSupplier;Lnet/minecraft/core/RegistryAccess;Z)V
 public net.minecraft.server.MinecraftServer LOGGER
 public net.minecraft.server.MinecraftServer doRunTask(Lnet/minecraft/server/TickTask;)V
 public net.minecraft.server.MinecraftServer executor
@@ -50,7 +53,6 @@ public net.minecraft.server.MinecraftServer$ReloadableResources
 public net.minecraft.server.RegistryLayer STATIC_ACCESS
 public net.minecraft.server.ReloadableServerResources
 public net.minecraft.server.ServerAdvancementManager advancements
-public net.minecraft.server.Services USERID_CACHE_FILE
 public net.minecraft.server.dedicated.DedicatedServerProperties$WorldDimensionData
 public net.minecraft.server.dedicated.Settings getStringRaw(Ljava/lang/String;)Ljava/lang/String;
 public net.minecraft.server.dedicated.Settings properties
@@ -70,17 +72,15 @@ public net.minecraft.server.level.ChunkMap setServerViewDistance(I)V
 public net.minecraft.server.level.ChunkMap toDrop
 public net.minecraft.server.level.ChunkMap updatingChunkMap
 public net.minecraft.server.level.ChunkMap visibleChunkMap
-public net.minecraft.server.level.ChunkMap$DistanceManager
 public net.minecraft.server.level.ChunkMap$TrackedEntity
 public net.minecraft.server.level.ChunkMap$TrackedEntity seenBy
 public net.minecraft.server.level.ChunkMap$TrackedEntity serverEntity
 public net.minecraft.server.level.DistanceManager simulationDistance
-public net.minecraft.server.level.DistanceManager ticketStorage
+public net.minecraft.server.level.DistanceManager tickets
 public net.minecraft.server.level.ServerBossEvent broadcast(Ljava/util/function/Function;)V
 public net.minecraft.server.level.ServerBossEvent visible
 public net.minecraft.server.level.ServerChunkCache mainThread
 public net.minecraft.server.level.ServerChunkCache mainThreadProcessor
-public net.minecraft.server.level.ServerChunkCache runDistanceManagerUpdates()Z
 public net.minecraft.server.level.ServerChunkCache spawnEnemies
 public net.minecraft.server.level.ServerChunkCache spawnFriendlies
 public net.minecraft.server.level.ServerChunkCache$MainThreadExecutor
@@ -91,7 +91,7 @@ public net.minecraft.server.level.ServerLevel getEntities()Lnet/minecraft/world/
 public net.minecraft.server.level.ServerLevel serverLevelData
 public net.minecraft.server.level.ServerPlayer completeUsingItem()V
 public net.minecraft.server.level.ServerPlayer containerSynchronizer
-public net.minecraft.server.level.ServerPlayer findRespawnAndUseSpawnBlock(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/server/level/ServerPlayer$RespawnConfig;Z)Ljava/util/Optional;
+public net.minecraft.server.level.ServerPlayer findRespawnAndUseSpawnBlock(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;FZZ)Ljava/util/Optional;
 public net.minecraft.server.level.ServerPlayer initMenu(Lnet/minecraft/world/inventory/AbstractContainerMenu;)V
 public net.minecraft.server.level.ServerPlayer isChangingDimension
 public net.minecraft.server.level.ServerPlayer language
@@ -103,25 +103,25 @@ public net.minecraft.server.level.ServerPlayer triggerDimensionChangeTriggers(Ln
 public net.minecraft.server.level.ServerPlayer wardenSpawnTracker
 public net.minecraft.server.level.ServerPlayer$RespawnPosAngle
 public net.minecraft.server.level.ServerPlayerGameMode level
-public net.minecraft.server.level.TicketType register(Ljava/lang/String;JZLnet/minecraft/server/level/TicketType$TicketUse;)Lnet/minecraft/server/level/TicketType;
+public net.minecraft.server.level.Ticket key
 public net.minecraft.server.network.ServerGamePacketListenerImpl isChatMessageIllegal(Ljava/lang/String;)Z
 public net.minecraft.server.network.ServerLoginPacketListenerImpl authenticatedProfile
 public net.minecraft.server.network.ServerLoginPacketListenerImpl connection
 public net.minecraft.server.network.ServerLoginPacketListenerImpl state
 public net.minecraft.server.network.ServerLoginPacketListenerImpl$State
+public net.minecraft.server.packs.VanillaPackResourcesBuilder safeGetPath(Ljava/net/URI;)Ljava/nio/file/Path;
 public net.minecraft.server.packs.repository.FolderRepositorySource$FolderPackDetector
 public net.minecraft.server.packs.repository.FolderRepositorySource$FolderPackDetector <init>(Lnet/minecraft/world/level/validation/DirectoryValidator;)V
 public net.minecraft.server.packs.repository.Pack resources
 public net.minecraft.server.players.PlayerList playerIo
 public net.minecraft.server.players.PlayerList players
 public net.minecraft.server.players.PlayerList updateEntireScoreboard(Lnet/minecraft/server/ServerScoreboard;Lnet/minecraft/server/level/ServerPlayer;)V
-public net.minecraft.server.players.PlayerList verifyChatTrusted(Lnet/minecraft/network/chat/PlayerChatMessage;)Z
 public net.minecraft.server.players.StoredUserEntry getUser()Ljava/lang/Object;
 public net.minecraft.stats.ServerRecipeBook known
 public net.minecraft.tags.TagEntry id
 public net.minecraft.tags.TagEntry required
 public net.minecraft.tags.TagEntry tag
-public net.minecraft.util.datafix.fixes.BlockStateData register(ILcom/mojang/serialization/Dynamic;[Lcom/mojang/serialization/Dynamic;)V
+public net.minecraft.util.datafix.fixes.BlockStateData register(ILjava/lang/String;[Ljava/lang/String;)V
 public net.minecraft.util.datafix.fixes.ItemIdFix ITEM_NAMES
 public net.minecraft.util.datafix.fixes.ItemSpawnEggFix ID_TO_ENTITY
 public net.minecraft.world.BossEvent color
@@ -130,21 +130,17 @@ public net.minecraft.world.BossEvent overlay
 public net.minecraft.world.CompoundContainer container1
 public net.minecraft.world.CompoundContainer container2
 public net.minecraft.world.SimpleContainer items
-public net.minecraft.world.damagesource.CombatTracker entries
-public net.minecraft.world.damagesource.CombatTracker getMostSignificantFall()Lnet/minecraft/world/damagesource/CombatEntry;
-public net.minecraft.world.damagesource.CombatTracker inCombat
-public net.minecraft.world.damagesource.CombatTracker mob
-public net.minecraft.world.damagesource.CombatTracker takingDamage
 public net.minecraft.world.damagesource.DamageSource <init>(Lnet/minecraft/core/Holder;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/phys/Vec3;)V
 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 owner
+public net.minecraft.world.entity.AreaEffectCloud ownerUUID
 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;
@@ -189,11 +185,8 @@ public net.minecraft.world.entity.Entity FLAG_INVISIBLE
 public net.minecraft.world.entity.Entity getEncodeId()Ljava/lang/String;
 public net.minecraft.world.entity.Entity getFireImmuneTicks()I
 public net.minecraft.world.entity.Entity getSharedFlag(I)Z
-public net.minecraft.world.entity.Entity getSwimHighSpeedSplashSound()Lnet/minecraft/sounds/SoundEvent;
-public net.minecraft.world.entity.Entity getSwimSound()Lnet/minecraft/sounds/SoundEvent;
-public net.minecraft.world.entity.Entity getSwimSplashSound()Lnet/minecraft/sounds/SoundEvent;
 public net.minecraft.world.entity.Entity hasVisualFire
-public net.minecraft.world.entity.Entity isAffectedByBlocks()Z
+public net.minecraft.world.entity.Entity isInBubbleColumn()Z
 public net.minecraft.world.entity.Entity isInRain()Z
 public net.minecraft.world.entity.Entity isInvulnerableToBase(Lnet/minecraft/world/damagesource/DamageSource;)Z
 public net.minecraft.world.entity.Entity onGround
@@ -203,11 +196,10 @@ public net.minecraft.world.entity.Entity random
 public net.minecraft.world.entity.Entity setLevel(Lnet/minecraft/world/level/Level;)V
 public net.minecraft.world.entity.Entity setRot(FF)V
 public net.minecraft.world.entity.Entity setSharedFlag(IZ)V
-public net.minecraft.world.entity.Entity teleportPassengers()V
 public net.minecraft.world.entity.Entity unsetRemoved()V
 public net.minecraft.world.entity.Entity wasTouchingWater
 public net.minecraft.world.entity.ExperienceOrb count
-public net.minecraft.world.entity.ExperienceOrb setValue(I)V
+public net.minecraft.world.entity.ExperienceOrb value
 public net.minecraft.world.entity.GlowSquid setDarkTicks(I)V
 public net.minecraft.world.entity.Interaction attack
 public net.minecraft.world.entity.Interaction getHeight()F
@@ -233,19 +225,18 @@ public net.minecraft.world.entity.LivingEntity detectEquipmentUpdates()V
 public net.minecraft.world.entity.LivingEntity effectsDirty
 public net.minecraft.world.entity.LivingEntity entityEventForEquipmentBreak(Lnet/minecraft/world/entity/EquipmentSlot;)B
 public net.minecraft.world.entity.LivingEntity getDeathSound()Lnet/minecraft/sounds/SoundEvent;
-public net.minecraft.world.entity.LivingEntity getFallDamageSound(I)Lnet/minecraft/sounds/SoundEvent;
-public net.minecraft.world.entity.LivingEntity getHurtSound(Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent;
 public net.minecraft.world.entity.LivingEntity getSoundVolume()F
 public net.minecraft.world.entity.LivingEntity jumping
 public net.minecraft.world.entity.LivingEntity lastHurt
 public net.minecraft.world.entity.LivingEntity lastHurtByMob
 public net.minecraft.world.entity.LivingEntity lastHurtByMobTimestamp
 public net.minecraft.world.entity.LivingEntity lastHurtByPlayer
-public net.minecraft.world.entity.LivingEntity lastHurtByPlayerMemoryTime
+public net.minecraft.world.entity.LivingEntity lastHurtByPlayerTime
-public net.minecraft.world.entity.LivingEntity playSecondaryHurtSound(Lnet/minecraft/world/damagesource/DamageSource;)V
 public net.minecraft.world.entity.LivingEntity setLivingEntityFlag(IZ)V
 public net.minecraft.world.entity.LivingEntity useItemRemaining
-public net.minecraft.world.entity.Mob getAmbientSound()Lnet/minecraft/sounds/SoundEvent;
+public net.minecraft.world.entity.Mob armorDropChances
+public net.minecraft.world.entity.Mob getEquipmentDropChance(Lnet/minecraft/world/entity/EquipmentSlot;)F
+public net.minecraft.world.entity.Mob handDropChances
 public net.minecraft.world.entity.Mob isSunBurnTick()Z
 public net.minecraft.world.entity.Mob lootTable
 public net.minecraft.world.entity.Mob lootTableSeed
@@ -273,64 +264,57 @@ public net.minecraft.world.entity.animal.Bee ticksWithoutNectarSinceExitingHive
 public net.minecraft.world.entity.animal.Cat isRelaxStateOne()Z
 public net.minecraft.world.entity.animal.Cat setCollarColor(Lnet/minecraft/world/item/DyeColor;)V
 public net.minecraft.world.entity.animal.Cat setRelaxStateOne(Z)V
-public net.minecraft.world.entity.animal.Cat setVariant(Lnet/minecraft/core/Holder;)V
-public net.minecraft.world.entity.animal.Dolphin treasurePos
 public net.minecraft.world.entity.animal.Fox DATA_TRUSTED_ID_0
 public net.minecraft.world.entity.animal.Fox DATA_TRUSTED_ID_1
 public net.minecraft.world.entity.animal.Fox isDefending()Z
 public net.minecraft.world.entity.animal.Fox setDefending(Z)V
 public net.minecraft.world.entity.animal.Fox setFaceplanted(Z)V
 public net.minecraft.world.entity.animal.Fox setSleeping(Z)V
-public net.minecraft.world.entity.animal.Fox setVariant(Lnet/minecraft/world/entity/animal/Fox$Variant;)V
-public net.minecraft.world.entity.animal.MushroomCow setVariant(Lnet/minecraft/world/entity/animal/MushroomCow$Variant;)V
 public net.minecraft.world.entity.animal.MushroomCow stewEffects
 public net.minecraft.world.entity.animal.Ocelot isTrusting()Z
 public net.minecraft.world.entity.animal.Ocelot setTrusting(Z)V
 public net.minecraft.world.entity.animal.Panda getEatCounter()I
 public net.minecraft.world.entity.animal.Panda setEatCounter(I)V
-public net.minecraft.world.entity.animal.Parrot setVariant(Lnet/minecraft/world/entity/animal/Parrot$Variant;)V
-public net.minecraft.world.entity.animal.Pig setVariant(Lnet/minecraft/core/Holder;)V
 public net.minecraft.world.entity.animal.Pig steering
 public net.minecraft.world.entity.animal.Rabbit moreCarrotTicks
 public net.minecraft.world.entity.animal.Rabbit registerGoals()V
-public net.minecraft.world.entity.animal.Rabbit setVariant(Lnet/minecraft/world/entity/animal/Rabbit$Variant;)V
-public net.minecraft.world.entity.animal.Salmon setVariant(Lnet/minecraft/world/entity/animal/Salmon$Variant;)V
 public net.minecraft.world.entity.animal.TropicalFish getPackedVariant()I
 public net.minecraft.world.entity.animal.TropicalFish setPackedVariant(I)V
-public net.minecraft.world.entity.animal.Turtle goingHome
+public net.minecraft.world.entity.animal.Turtle getHomePos()Lnet/minecraft/core/BlockPos;
-public net.minecraft.world.entity.animal.Turtle homePos
+public net.minecraft.world.entity.animal.Turtle isGoingHome()Z
+public net.minecraft.world.entity.animal.Turtle isTravelling()Z
+public net.minecraft.world.entity.animal.Turtle setGoingHome(Z)V
 public net.minecraft.world.entity.animal.Turtle setHasEgg(Z)V
+public net.minecraft.world.entity.animal.Turtle setTravelling(Z)V
+public net.minecraft.world.entity.animal.Wolf isWet
+public net.minecraft.world.entity.animal.Wolf setCollarColor(Lnet/minecraft/world/item/DyeColor;)V
 public net.minecraft.world.entity.animal.allay.Allay canDuplicate()Z
 public net.minecraft.world.entity.animal.allay.Allay duplicateAllay()V
 public net.minecraft.world.entity.animal.allay.Allay duplicationCooldown
 public net.minecraft.world.entity.animal.allay.Allay jukeboxPos
 public net.minecraft.world.entity.animal.allay.Allay resetDuplicationCooldown()V
-public net.minecraft.world.entity.animal.axolotl.Axolotl setVariant(Lnet/minecraft/world/entity/animal/axolotl/Axolotl$Variant;)V
-public net.minecraft.world.entity.animal.frog.Frog setVariant(Lnet/minecraft/core/Holder;)V
 public net.minecraft.world.entity.animal.frog.Tadpole age
 public net.minecraft.world.entity.animal.goat.Goat DATA_HAS_LEFT_HORN
 public net.minecraft.world.entity.animal.goat.Goat DATA_HAS_RIGHT_HORN
 public net.minecraft.world.entity.animal.horse.AbstractHorse createInventory()V
 public net.minecraft.world.entity.animal.horse.AbstractHorse inventory
-public net.minecraft.world.entity.animal.horse.AbstractHorse owner
 public net.minecraft.world.entity.animal.horse.Horse setVariantAndMarkings(Lnet/minecraft/world/entity/animal/horse/Variant;Lnet/minecraft/world/entity/animal/horse/Markings;)V
-public net.minecraft.world.entity.animal.horse.Llama setVariant(Lnet/minecraft/world/entity/animal/horse/Llama$Variant;)V
 public net.minecraft.world.entity.animal.horse.SkeletonHorse trapTime
 public net.minecraft.world.entity.animal.sniffer.Sniffer calculateDigPosition()Ljava/util/Optional;
 public net.minecraft.world.entity.animal.sniffer.Sniffer canDig()Z
 public net.minecraft.world.entity.animal.sniffer.Sniffer getExploredPositions()Ljava/util/stream/Stream;
 public net.minecraft.world.entity.animal.sniffer.Sniffer getState()Lnet/minecraft/world/entity/animal/sniffer/Sniffer$State;
 public net.minecraft.world.entity.animal.sniffer.Sniffer storeExploredPosition(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/entity/animal/sniffer/Sniffer;
-public net.minecraft.world.entity.animal.wolf.Wolf getSoundVariant()Lnet/minecraft/core/Holder;
-public net.minecraft.world.entity.animal.wolf.Wolf getVariant()Lnet/minecraft/core/Holder;
-public net.minecraft.world.entity.animal.wolf.Wolf isWet
-public net.minecraft.world.entity.animal.wolf.Wolf setCollarColor(Lnet/minecraft/world/item/DyeColor;)V
-public net.minecraft.world.entity.animal.wolf.Wolf setSoundVariant(Lnet/minecraft/core/Holder;)V
-public net.minecraft.world.entity.animal.wolf.Wolf setVariant(Lnet/minecraft/core/Holder;)V
 public net.minecraft.world.entity.boss.enderdragon.EnderDragon subEntities
 public net.minecraft.world.entity.boss.wither.WitherBoss bossEvent
+public net.minecraft.world.entity.decoration.ArmorStand bodyPose
 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
@@ -339,7 +323,6 @@ public net.minecraft.world.entity.decoration.ItemFrame DATA_ROTATION
 public net.minecraft.world.entity.decoration.ItemFrame dropChance
 public net.minecraft.world.entity.decoration.ItemFrame fixed
 public net.minecraft.world.entity.decoration.ItemFrame setDirection(Lnet/minecraft/core/Direction;)V
-public net.minecraft.world.entity.decoration.Painting setVariant(Lnet/minecraft/core/Holder;)V
 public net.minecraft.world.entity.item.FallingBlockEntity <init>(Lnet/minecraft/world/level/Level;DDDLnet/minecraft/world/level/block/state/BlockState;)V
 public net.minecraft.world.entity.item.FallingBlockEntity blockState
 public net.minecraft.world.entity.item.FallingBlockEntity cancelDrop
@@ -357,11 +340,13 @@ 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
-public net.minecraft.world.entity.monster.Evoker getWololoTarget()Lnet/minecraft/world/entity/animal/sheep/Sheep;
+public net.minecraft.world.entity.monster.Evoker getWololoTarget()Lnet/minecraft/world/entity/animal/Sheep;
-public net.minecraft.world.entity.monster.Evoker setWololoTarget(Lnet/minecraft/world/entity/animal/sheep/Sheep;)V
+public net.minecraft.world.entity.monster.Evoker setWololoTarget(Lnet/minecraft/world/entity/animal/Sheep;)V
 public net.minecraft.world.entity.monster.Guardian randomStrollGoal
 public net.minecraft.world.entity.monster.Guardian setActiveAttackTarget(I)V
 public net.minecraft.world.entity.monster.Guardian$GuardianAttackGoal
@@ -383,7 +368,6 @@ 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
@@ -411,29 +395,18 @@ 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
-public net.minecraft.world.entity.player.Inventory equipment
+public net.minecraft.world.entity.player.Inventory compartments
 public net.minecraft.world.entity.player.Player DATA_PLAYER_MODE_CUSTOMISATION
 public net.minecraft.world.entity.player.Player closeContainer()V
 public net.minecraft.world.entity.player.Player enchantmentSeed
 public net.minecraft.world.entity.player.Player getFireImmuneTicks()I
-public net.minecraft.world.entity.player.Player hurtDir
 public net.minecraft.world.entity.player.Player removeEntitiesOnShoulder()V
 public net.minecraft.world.entity.player.Player setShoulderEntityLeft(Lnet/minecraft/nbt/CompoundTag;)V
 public net.minecraft.world.entity.player.Player setShoulderEntityRight(Lnet/minecraft/nbt/CompoundTag;)V
 public net.minecraft.world.entity.player.Player sleepCounter
-public net.minecraft.world.entity.projectile.AbstractArrow baseDamage
-public net.minecraft.world.entity.projectile.AbstractArrow firedFromWeapon
-public net.minecraft.world.entity.projectile.AbstractArrow getHitGroundSoundEvent()Lnet/minecraft/sounds/SoundEvent;
-public net.minecraft.world.entity.projectile.AbstractArrow getPickupItem()Lnet/minecraft/world/item/ItemStack;
-public net.minecraft.world.entity.projectile.AbstractArrow isInGround()Z
-public net.minecraft.world.entity.projectile.AbstractArrow life
-public net.minecraft.world.entity.projectile.AbstractArrow pickupItemStack
-public net.minecraft.world.entity.projectile.AbstractArrow setPickupItemStack(Lnet/minecraft/world/item/ItemStack;)V
-public net.minecraft.world.entity.projectile.AbstractArrow setPierceLevel(B)V
 public net.minecraft.world.entity.projectile.AbstractHurtingProjectile assignDirectionalMovement(Lnet/minecraft/world/phys/Vec3;D)V
 public net.minecraft.world.entity.projectile.Arrow NO_EFFECT_COLOR
 public net.minecraft.world.entity.projectile.Arrow getPotionContents()Lnet/minecraft/world/item/alchemy/PotionContents;
@@ -442,7 +415,9 @@ 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 target
+public net.minecraft.world.entity.projectile.EyeOfEnder tx
+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
@@ -462,16 +437,17 @@ 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 owner
+public net.minecraft.world.entity.projectile.Projectile ownerUUID
 public net.minecraft.world.entity.projectile.ShulkerBullet currentMoveDirection
 public net.minecraft.world.entity.projectile.ShulkerBullet flightSteps
 public net.minecraft.world.entity.projectile.ShulkerBullet targetDeltaX
 public net.minecraft.world.entity.projectile.ShulkerBullet targetDeltaY
 public net.minecraft.world.entity.projectile.ShulkerBullet targetDeltaZ
 public net.minecraft.world.entity.projectile.SpectralArrow duration
-public net.minecraft.world.entity.projectile.ThrowableItemProjectile getDefaultItem()Lnet/minecraft/world/item/Item;
+public net.minecraft.world.entity.projectile.ThrownPotion isLingering()Z
 public net.minecraft.world.entity.projectile.ThrownTrident dealtDamage
 public net.minecraft.world.entity.projectile.windcharge.AbstractWindCharge explode(Lnet/minecraft/world/phys/Vec3;)V
 public net.minecraft.world.entity.projectile.windcharge.BreezeWindCharge explode(Lnet/minecraft/world/phys/Vec3;)V
@@ -484,6 +460,7 @@ public net.minecraft.world.entity.raid.Raid ticksActive
 public net.minecraft.world.entity.raid.Raid totalHealth
 public net.minecraft.world.entity.raid.Raider$HoldGroundAttackGoal
 public net.minecraft.world.entity.raid.Raids raidMap
+public net.minecraft.world.entity.vehicle.AbstractBoat getDropItem()Lnet/minecraft/world/item/Item;
 public net.minecraft.world.entity.vehicle.AbstractBoat getStatus()Lnet/minecraft/world/entity/vehicle/AbstractBoat$Status;
 public net.minecraft.world.entity.vehicle.AbstractBoat status
 public net.minecraft.world.entity.vehicle.AbstractMinecartContainer lootTable
@@ -494,14 +471,12 @@ public net.minecraft.world.entity.vehicle.MinecartTNT explode(D)V
 public net.minecraft.world.entity.vehicle.MinecartTNT explosionPowerBase
 public net.minecraft.world.entity.vehicle.MinecartTNT explosionSpeedFactor
 public net.minecraft.world.entity.vehicle.MinecartTNT fuse
-public net.minecraft.world.entity.vehicle.VehicleEntity getDropItem()Lnet/minecraft/world/item/Item;
 public net.minecraft.world.flag.FeatureFlag mask
 public net.minecraft.world.flag.FeatureFlag universe
 public net.minecraft.world.flag.FeatureFlagRegistry names
 public net.minecraft.world.food.FoodData exhaustionLevel
 public net.minecraft.world.food.FoodData foodLevel
 public net.minecraft.world.food.FoodData saturationLevel
-public net.minecraft.world.inventory.AbstractContainerMenu menuType
 public net.minecraft.world.inventory.AbstractContainerMenu quickcraftSlots
 public net.minecraft.world.inventory.AbstractContainerMenu quickcraftStatus
 public net.minecraft.world.inventory.AbstractContainerMenu quickcraftType
@@ -515,9 +490,6 @@ public net.minecraft.world.inventory.BrewingStandMenu brewingStandData
 public net.minecraft.world.inventory.CraftingMenu access
 public net.minecraft.world.inventory.DispenserMenu dispenser
 public net.minecraft.world.inventory.HorseInventoryMenu SLOT_BODY_ARMOR
-public net.minecraft.world.inventory.HorseInventoryMenu SLOT_HORSE_INVENTORY_START
-public net.minecraft.world.inventory.HorseInventoryMenu SLOT_SADDLE
-public net.minecraft.world.inventory.HorseInventoryMenu horse
 public net.minecraft.world.inventory.MerchantContainer selectionHint
 public net.minecraft.world.inventory.Slot slot
 public net.minecraft.world.item.AdventureModePredicate predicates
@@ -529,15 +501,15 @@ public net.minecraft.world.item.ItemCooldowns tickCount
 public net.minecraft.world.item.ItemCooldowns$CooldownInstance
 public net.minecraft.world.item.ItemStackLinkedSet TYPE_AND_TAG
 public net.minecraft.world.item.JukeboxSongPlayer song
-public net.minecraft.world.item.MapItem createNewSavedData(Lnet/minecraft/server/level/ServerLevel;IIIZZLnet/minecraft/resources/ResourceKey;)Lnet/minecraft/world/level/saveddata/maps/MapId;
+public net.minecraft.world.item.MapItem createNewSavedData(Lnet/minecraft/world/level/Level;IIIZZLnet/minecraft/resources/ResourceKey;)Lnet/minecraft/world/level/saveddata/maps/MapId;
 public net.minecraft.world.item.StandingAndWallBlockItem wallBlock
-public net.minecraft.world.item.component.BundleContents$Mutable getMaxAmountToAdd(Lnet/minecraft/world/item/ItemStack;)I
 public net.minecraft.world.item.component.ItemContainerContents MAX_SIZE
 public net.minecraft.world.item.component.ItemContainerContents items
 public net.minecraft.world.item.context.UseOnContext <init>(Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/phys/BlockHitResult;)V
 public net.minecraft.world.item.crafting.RecipeManager recipes
 public net.minecraft.world.item.crafting.RecipeMap byKey
 public net.minecraft.world.item.crafting.RecipeMap byType
+public net.minecraft.world.item.enchantment.ItemEnchantments showInTooltip
 public net.minecraft.world.item.trading.MerchantOffer demand
 public net.minecraft.world.item.trading.MerchantOffer result
 public net.minecraft.world.item.trading.MerchantOffer specialPriceDiff
@@ -554,10 +526,7 @@ public net.minecraft.world.level.BaseSpawner spawnCount
 public net.minecraft.world.level.BaseSpawner spawnDelay
 public net.minecraft.world.level.BaseSpawner spawnPotentials
 public net.minecraft.world.level.BaseSpawner spawnRange
-public net.minecraft.world.level.GameRules GAME_RULE_TYPES
-public net.minecraft.world.level.GameRules$Value deserialize(Ljava/lang/String;)V
 public net.minecraft.world.level.GameRules$Value onChanged(Lnet/minecraft/server/MinecraftServer;)V
-public net.minecraft.world.level.Level blockEntityTickers
 public net.minecraft.world.level.Level getEntities()Lnet/minecraft/world/level/entity/LevelEntityGetter;
 public net.minecraft.world.level.Level levelData
 public net.minecraft.world.level.Level rainLevel
@@ -565,7 +534,6 @@ public net.minecraft.world.level.Level thread
 public net.minecraft.world.level.Level thunderLevel
 public net.minecraft.world.level.NaturalSpawner SPAWNING_CATEGORIES
 public net.minecraft.world.level.StructureManager level
-public net.minecraft.world.level.TicketStorage tickets
 public net.minecraft.world.level.biome.Biome climateSettings
 public net.minecraft.world.level.biome.Biome getTemperature(Lnet/minecraft/core/BlockPos;I)F
 public net.minecraft.world.level.biome.Biome$ClimateSettings
@@ -590,7 +558,6 @@ public net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity cooking
 public net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity getTotalCookTime(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity;)I
 public net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity litTimeRemaining
 public net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity recipesUsed
-public net.minecraft.world.level.block.entity.BannerBlockEntity name
 public net.minecraft.world.level.block.entity.BarrelBlockEntity openersCounter
 public net.minecraft.world.level.block.entity.BarrelBlockEntity playSound(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/sounds/SoundEvent;)V
 public net.minecraft.world.level.block.entity.BarrelBlockEntity updateBlockState(Lnet/minecraft/world/level/block/state/BlockState;Z)V
@@ -605,7 +572,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/world/level/storage/ValueOutput;)V
+public net.minecraft.world.level.block.entity.BlockEntity saveId(Lnet/minecraft/nbt/CompoundTag;)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
@@ -617,11 +584,10 @@ 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
@@ -636,7 +602,6 @@ public net.minecraft.world.level.block.entity.SculkSensorBlockEntity lastVibrati
 public net.minecraft.world.level.block.entity.SculkShriekerBlockEntity warningLevel
 public net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity openCount
 public net.minecraft.world.level.block.entity.SignBlockEntity playerWhoMayEdit
-public net.minecraft.world.level.block.entity.SkullBlockEntity customName
 public net.minecraft.world.level.block.entity.SkullBlockEntity noteBlockSound
 public net.minecraft.world.level.block.entity.SkullBlockEntity owner
 public net.minecraft.world.level.block.entity.StructureBlockEntity author
@@ -655,19 +620,11 @@ 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.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 nextSpawnData
-public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerStateData nextMobSpawnsAt
-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
-public net.minecraft.world.level.block.entity.vault.VaultServerData stateUpdatingResumesAt()J
-public net.minecraft.world.level.block.entity.vault.VaultSharedData getConnectedPlayers()Ljava/util/Set;
 public net.minecraft.world.level.block.state.BlockBehaviour getMenuProvider(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/MenuProvider;
 public net.minecraft.world.level.block.state.BlockBehaviour hasCollision
 public net.minecraft.world.level.block.state.BlockBehaviour$BlockStateBase destroySpeed
@@ -681,7 +638,6 @@ 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;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
@@ -714,7 +670,6 @@ public net.minecraft.world.level.levelgen.SurfaceRules$LazyCondition
 public net.minecraft.world.level.levelgen.SurfaceRules$LazyYCondition
 public net.minecraft.world.level.levelgen.SurfaceRules$SurfaceRule
 public net.minecraft.world.level.levelgen.SurfaceRules$VerticalGradientConditionSource
-public net.minecraft.world.level.levelgen.structure.StructurePiece SHAPE_CHECK_BLOCKS
 public net.minecraft.world.level.levelgen.structure.placement.StructurePlacement exclusionZone
 public net.minecraft.world.level.levelgen.structure.placement.StructurePlacement frequency
 public net.minecraft.world.level.levelgen.structure.placement.StructurePlacement frequencyReductionMethod
@@ -746,6 +701,7 @@ public-f net.minecraft.server.ReloadableServerResources commands
 public-f net.minecraft.server.dedicated.DedicatedServer serverLinks
 public-f net.minecraft.server.dedicated.DedicatedServer settings
 public-f net.minecraft.server.dedicated.DedicatedServerProperties pauseWhenEmptySeconds
+public-f net.minecraft.server.level.TicketType timeout
 public-f net.minecraft.server.players.PlayerList maxPlayers
 public-f net.minecraft.world.entity.LivingEntity combatTracker
 public-f net.minecraft.world.entity.LivingEntity invulnerableDuration
@@ -758,6 +714,7 @@ public-f net.minecraft.world.inventory.AbstractContainerMenu lastSlots
 public-f net.minecraft.world.inventory.AbstractContainerMenu remoteDataSlots
 public-f net.minecraft.world.inventory.AbstractContainerMenu remoteSlots
 public-f net.minecraft.world.inventory.AbstractContainerMenu slots
+public-f net.minecraft.world.item.enchantment.ItemEnchantments$Mutable showInTooltip
 public-f net.minecraft.world.item.trading.MerchantOffer baseCostA
 public-f net.minecraft.world.item.trading.MerchantOffer costB
 public-f net.minecraft.world.item.trading.MerchantOffer maxUses
@@ -766,8 +723,11 @@ public-f net.minecraft.world.item.trading.MerchantOffer rewardExp
 public-f net.minecraft.world.item.trading.MerchantOffer xp
 public-f net.minecraft.world.level.LevelSettings hardcore
 public-f net.minecraft.world.level.LevelSettings levelName
-public-f net.minecraft.world.level.block.ChestBlock MENU_PROVIDER_COMBINER
 public-f net.minecraft.world.level.block.entity.BannerBlockEntity baseColor
+public-f net.minecraft.world.level.block.entity.trialspawner.TrialSpawner normalConfig
+public-f net.minecraft.world.level.block.entity.trialspawner.TrialSpawner ominousConfig
+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	H
+	f	Lnet/minecraft/server/level/ChunkMap$ChunkDistanceManager;	distanceManager	G
 
 # The method is made public by Spigot, which then causes accidental overrides
 c	net/minecraft/world/entity/Entity	net/minecraft/world/entity/Entity

build.gradle.kts

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

gradle.properties

@@ -1,9 +1,10 @@
 group=io.papermc.paper
-version=1.21.6-R0.1-SNAPSHOT
+version=1.21.4-R0.1-SNAPSHOT
-mcVersion=1.21.6
+mcVersion=1.21.4
 
 # Set to true while updating Minecraft version
 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.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

paper-api-generator/build.gradle.kts

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

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

@@ -21,7 +21,6 @@ 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,18 +66,18 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
+@GeneratedFrom("1.21.4")
 @NullMarked
-@GeneratedFrom("1.21.6")
 public interface VanillaGoal<T extends Mob> extends Goal<T> {
-    GoalKey<AbstractHorse> HORSE_RANDOM_STAND = create("horse_random_stand", AbstractHorse.class);
+    GoalKey<AbstractHorse> RANDOM_STAND = create("random_stand", AbstractHorse.class);
 
-    GoalKey<AbstractHorse> HORSE_RUN_AROUND_LIKE_CRAZY = create("horse_run_around_like_crazy", AbstractHorse.class);
+    GoalKey<AbstractHorse> RUN_AROUND_LIKE_CRAZY = create("run_around_like_crazy", AbstractHorse.class);
 
-    GoalKey<AbstractSkeleton> SKELETON_MELEE = create("skeleton_melee", AbstractSkeleton.class);
+    GoalKey<AbstractSkeleton> ABSTRACT_SKELETON_MELEE = create("abstract_skeleton_melee", AbstractSkeleton.class);
 
-    GoalKey<AbstractVillager> VILLAGER_LOOK_AT_TRADING_PLAYER = create("villager_look_at_trading_player", AbstractVillager.class);
+    GoalKey<AbstractVillager> LOOK_AT_TRADING_PLAYER = create("look_at_trading_player", AbstractVillager.class);
 
-    GoalKey<AbstractVillager> VILLAGER_TRADE_WITH_PLAYER = create("villager_trade_with_player", AbstractVillager.class);
+    GoalKey<AbstractVillager> TRADE_WITH_PLAYER = create("trade_with_player", AbstractVillager.class);
 
     GoalKey<Animals> BREED = create("breed", Animals.class);
 
@@ -102,12 +101,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);
@@ -166,16 +165,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> CREEPER_SWELL = create("creeper_swell", Creeper.class);
+    GoalKey<Creeper> SWELL = create("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);
@@ -200,14 +199,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);
@@ -218,27 +217,29 @@ 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<HappyGhast> HAPPY_GHAST_FLOAT = create("happy_ghast_float", HappyGhast.class);
+    GoalKey<Illager> HOLD_GROUND_ATTACK = create("hold_ground_attack", Illager.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);
 
@@ -246,9 +247,9 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
 
     GoalKey<Illusioner> ILLUSIONER_MIRROR_SPELL = create("illusioner_mirror_spell", Illusioner.class);
 
-    GoalKey<IronGolem> IRON_GOLEM_DEFEND_VILLAGE = create("iron_golem_defend_village", IronGolem.class);
+    GoalKey<IronGolem> DEFEND_VILLAGE = create("defend_village", IronGolem.class);
 
-    GoalKey<IronGolem> IRON_GOLEM_OFFER_FLOWER = create("iron_golem_offer_flower", IronGolem.class);
+    GoalKey<IronGolem> OFFER_FLOWER = create("offer_flower", IronGolem.class);
 
     GoalKey<Llama> LLAMA_ATTACK_WOLF = create("llama_attack_wolf", Llama.class);
 
@@ -268,8 +269,6 @@ 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);
@@ -282,14 +281,10 @@ 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);
@@ -322,7 +317,7 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
 
     GoalKey<Panda> PANDA_SNEEZE = create("panda_sneeze", Panda.class);
 
-    GoalKey<Parrot> PARROT_LAND_ON_OWNERS_SHOULDER = create("parrot_land_on_owners_shoulder", Parrot.class);
+    GoalKey<Parrot> LAND_ON_OWNERS_SHOULDER = create("land_on_owners_shoulder", Parrot.class);
 
     GoalKey<Phantom> PHANTOM_ATTACK_PLAYER = create("phantom_attack_player", Phantom.class);
 
@@ -344,27 +339,27 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
 
     GoalKey<Rabbit> RABBIT_PANIC = create("rabbit_panic", Rabbit.class);
 
-    GoalKey<Rabbit> RABBIT_RAID_GARDEN = create("rabbit_raid_garden", Rabbit.class);
+    GoalKey<Rabbit> RAID_GARDEN = create("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> SCHOOLABLE_FISH_FOLLOW_FLOCK_LEADER = create("schoolable_fish_follow_flock_leader", SchoolableFish.class);
+    GoalKey<SchoolableFish> FOLLOW_FLOCK_LEADER = create("follow_flock_leader", SchoolableFish.class);
 
     GoalKey<Shulker> SHULKER_ATTACK = create("shulker_attack", Shulker.class);
 
@@ -378,7 +373,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_HORSE_SKELETON_TRAP = create("skeleton_horse_skeleton_trap", SkeletonHorse.class);
+    GoalKey<SkeletonHorse> SKELETON_TRAP = create("skeleton_trap", SkeletonHorse.class);
 
     GoalKey<Slime> SLIME_ATTACK = create("slime_attack", Slime.class);
 
@@ -434,13 +429,13 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
 
     GoalKey<Vindicator> VINDICATOR_JOHNNY_ATTACK = create("vindicator_johnny_attack", Vindicator.class);
 
-    GoalKey<WanderingTrader> WANDERING_TRADER_WANDER_TO_POSITION = create("wandering_trader_wander_to_position", WanderingTrader.class);
+    GoalKey<WanderingTrader> WANDER_TO_POSITION = create("wander_to_position", WanderingTrader.class);
 
     GoalKey<Wither> WITHER_DO_NOTHING = create("wither_do_nothing", Wither.class);
 
-    GoalKey<Wolf> WOLF_AVOID_ENTITY = create("wolf_avoid_entity", Wolf.class);
+    GoalKey<Wolf> BEG = create("beg", Wolf.class);
 
-    GoalKey<Wolf> WOLF_BEG = create("wolf_beg", Wolf.class);
+    GoalKey<Wolf> WOLF_AVOID_ENTITY = create("wolf_avoid_entity", Wolf.class);
 
     GoalKey<Zombie> ZOMBIE_ATTACK = create("zombie_attack", Zombie.class);
 

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

@@ -7,6 +7,7 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.attribute.Attribute;
+import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -22,8 +23,9 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
+@GeneratedFrom("1.21.4")
 @NullMarked
-@GeneratedFrom("1.21.6")
+@ApiStatus.Experimental
 public final class AttributeKeys {
     /**
      * {@code minecraft:armor}
@@ -81,13 +83,6 @@ 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}
      *
@@ -256,20 +251,6 @@ 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-generator/generated/io/papermc/paper/registry/keys/BannerPatternKeys.java

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -7,6 +7,7 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.inventory.ItemType;
+import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -22,8 +23,9 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
+@GeneratedFrom("1.21.4")
 @NullMarked
-@GeneratedFrom("1.21.6")
+@ApiStatus.Experimental
 public final class ItemTypeKeys {
     /**
      * {@code minecraft:acacia_boat}
@@ -746,13 +748,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> BLACK_GLAZED_TERRACOTTA = create(key("black_glazed_terracotta"));
 
-    /**
-     * {@code minecraft:black_harness}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> BLACK_HARNESS = create(key("black_harness"));
-
     /**
      * {@code minecraft:black_shulker_box}
      *
@@ -907,13 +902,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> BLUE_DYE = create(key("blue_dye"));
 
-    /**
-     * {@code minecraft:blue_egg}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> BLUE_EGG = create(key("blue_egg"));
-
     /**
      * {@code minecraft:blue_glazed_terracotta}
      *
@@ -921,13 +909,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> BLUE_GLAZED_TERRACOTTA = create(key("blue_glazed_terracotta"));
 
-    /**
-     * {@code minecraft:blue_harness}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> BLUE_HARNESS = create(key("blue_harness"));
-
     /**
      * {@code minecraft:blue_ice}
      *
@@ -1194,13 +1175,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> BROWN_DYE = create(key("brown_dye"));
 
-    /**
-     * {@code minecraft:brown_egg}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> BROWN_EGG = create(key("brown_egg"));
-
     /**
      * {@code minecraft:brown_glazed_terracotta}
      *
@@ -1208,13 +1182,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> BROWN_GLAZED_TERRACOTTA = create(key("brown_glazed_terracotta"));
 
-    /**
-     * {@code minecraft:brown_harness}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> BROWN_HARNESS = create(key("brown_harness"));
-
     /**
      * {@code minecraft:brown_mushroom}
      *
@@ -1320,13 +1287,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> BURN_POTTERY_SHERD = create(key("burn_pottery_sherd"));
 
-    /**
-     * {@code minecraft:bush}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> BUSH = create(key("bush"));
-
     /**
      * {@code minecraft:cactus}
      *
@@ -1334,13 +1294,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> CACTUS = create(key("cactus"));
 
-    /**
-     * {@code minecraft:cactus_flower}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> CACTUS_FLOWER = create(key("cactus_flower"));
-
     /**
      * {@code minecraft:cake}
      *
@@ -2377,13 +2330,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> CYAN_GLAZED_TERRACOTTA = create(key("cyan_glazed_terracotta"));
 
-    /**
-     * {@code minecraft:cyan_harness}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> CYAN_HARNESS = create(key("cyan_harness"));
-
     /**
      * {@code minecraft:cyan_shulker_box}
      *
@@ -2972,6 +2918,76 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> DIRT_PATH = create(key("dirt_path"));
 
+    /**
+     * {@code minecraft:field_masoned_banner_pattern}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> FIELD_MASONED_BANNER_PATTERN = create(key("field_masoned_banner_pattern"));
+
+    /**
+     * {@code minecraft:fletching_table}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> FLETCHING_TABLE = create(key("fletching_table"));
+
+    /**
+     * {@code minecraft:flow_banner_pattern}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> FLOW_BANNER_PATTERN = create(key("flow_banner_pattern"));
+
+    /**
+     * {@code minecraft:flower_banner_pattern}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> FLOWER_BANNER_PATTERN = create(key("flower_banner_pattern"));
+
+    /**
+     * {@code minecraft:glow_berries}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> GLOW_BERRIES = create(key("glow_berries"));
+
+    /**
+     * {@code minecraft:goat_horn}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> GOAT_HORN = create(key("goat_horn"));
+
+    /**
+     * {@code minecraft:grindstone}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> GRINDSTONE = create(key("grindstone"));
+
+    /**
+     * {@code minecraft:honeycomb}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> HONEYCOMB = create(key("honeycomb"));
+
+    /**
+     * {@code minecraft:lantern}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> LANTERN = create(key("lantern"));
+
+    /**
+     * {@code minecraft:music_disc_5}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> MUSIC_DISC_5 = create(key("music_disc_5"));
+
     /**
      * {@code minecraft:disc_fragment_5}
      *
@@ -3021,13 +3037,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> DRAGON_HEAD = create(key("dragon_head"));
 
-    /**
-     * {@code minecraft:dried_ghast}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> DRIED_GHAST = create(key("dried_ghast"));
-
     /**
      * {@code minecraft:dried_kelp}
      *
@@ -3357,13 +3366,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> FERN = create(key("fern"));
 
-    /**
-     * {@code minecraft:field_masoned_banner_pattern}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> FIELD_MASONED_BANNER_PATTERN = create(key("field_masoned_banner_pattern"));
-
     /**
      * {@code minecraft:filled_map}
      *
@@ -3399,13 +3401,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> FIRE_CORAL_FAN = create(key("fire_coral_fan"));
 
-    /**
-     * {@code minecraft:firefly_bush}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> FIREFLY_BUSH = create(key("firefly_bush"));
-
     /**
      * {@code minecraft:firework_rocket}
      *
@@ -3427,13 +3422,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> FISHING_ROD = create(key("fishing_rod"));
 
-    /**
-     * {@code minecraft:fletching_table}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> FLETCHING_TABLE = create(key("fletching_table"));
-
     /**
      * {@code minecraft:flint}
      *
@@ -3455,13 +3443,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> FLOW_ARMOR_TRIM_SMITHING_TEMPLATE = create(key("flow_armor_trim_smithing_template"));
 
-    /**
-     * {@code minecraft:flow_banner_pattern}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> FLOW_BANNER_PATTERN = create(key("flow_banner_pattern"));
-
     /**
      * {@code minecraft:flow_pottery_sherd}
      *
@@ -3469,13 +3450,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> FLOW_POTTERY_SHERD = create(key("flow_pottery_sherd"));
 
-    /**
-     * {@code minecraft:flower_banner_pattern}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> FLOWER_BANNER_PATTERN = create(key("flower_banner_pattern"));
-
     /**
      * {@code minecraft:flower_pot}
      *
@@ -3595,13 +3569,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> GLOBE_BANNER_PATTERN = create(key("globe_banner_pattern"));
 
-    /**
-     * {@code minecraft:glow_berries}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> GLOW_BERRIES = create(key("glow_berries"));
-
     /**
      * {@code minecraft:glow_ink_sac}
      *
@@ -3644,13 +3611,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> GLOWSTONE_DUST = create(key("glowstone_dust"));
 
-    /**
-     * {@code minecraft:goat_horn}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> GOAT_HORN = create(key("goat_horn"));
-
     /**
      * {@code minecraft:goat_spawn_egg}
      *
@@ -3875,13 +3835,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> GRAY_GLAZED_TERRACOTTA = create(key("gray_glazed_terracotta"));
 
-    /**
-     * {@code minecraft:gray_harness}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> GRAY_HARNESS = create(key("gray_harness"));
-
     /**
      * {@code minecraft:gray_shulker_box}
      *
@@ -3980,13 +3933,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> GREEN_GLAZED_TERRACOTTA = create(key("green_glazed_terracotta"));
 
-    /**
-     * {@code minecraft:green_harness}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> GREEN_HARNESS = create(key("green_harness"));
-
     /**
      * {@code minecraft:green_shulker_box}
      *
@@ -4022,13 +3968,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> GREEN_WOOL = create(key("green_wool"));
 
-    /**
-     * {@code minecraft:grindstone}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> GRINDSTONE = create(key("grindstone"));
-
     /**
      * {@code minecraft:guardian_spawn_egg}
      *
@@ -4064,13 +4003,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> HANGING_ROOTS = create(key("hanging_roots"));
 
-    /**
-     * {@code minecraft:happy_ghast_spawn_egg}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> HAPPY_GHAST_SPAWN_EGG = create(key("happy_ghast_spawn_egg"));
-
     /**
      * {@code minecraft:hay_block}
      *
@@ -4134,13 +4066,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> HONEY_BOTTLE = create(key("honey_bottle"));
 
-    /**
-     * {@code minecraft:honeycomb}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> HONEYCOMB = create(key("honeycomb"));
-
     /**
      * {@code minecraft:honeycomb_block}
      *
@@ -4568,13 +4493,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> LADDER = create(key("ladder"));
 
-    /**
-     * {@code minecraft:lantern}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> LANTERN = create(key("lantern"));
-
     /**
      * {@code minecraft:lapis_block}
      *
@@ -4624,13 +4542,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> LEAD = create(key("lead"));
 
-    /**
-     * {@code minecraft:leaf_litter}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> LEAF_LITTER = create(key("leaf_litter"));
-
     /**
      * {@code minecraft:leather}
      *
@@ -4757,13 +4668,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> LIGHT_BLUE_GLAZED_TERRACOTTA = create(key("light_blue_glazed_terracotta"));
 
-    /**
-     * {@code minecraft:light_blue_harness}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> LIGHT_BLUE_HARNESS = create(key("light_blue_harness"));
-
     /**
      * {@code minecraft:light_blue_shulker_box}
      *
@@ -4862,13 +4766,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> LIGHT_GRAY_GLAZED_TERRACOTTA = create(key("light_gray_glazed_terracotta"));
 
-    /**
-     * {@code minecraft:light_gray_harness}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> LIGHT_GRAY_HARNESS = create(key("light_gray_harness"));
-
     /**
      * {@code minecraft:light_gray_shulker_box}
      *
@@ -5002,13 +4899,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> LIME_GLAZED_TERRACOTTA = create(key("lime_glazed_terracotta"));
 
-    /**
-     * {@code minecraft:lime_harness}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> LIME_HARNESS = create(key("lime_harness"));
-
     /**
      * {@code minecraft:lime_shulker_box}
      *
@@ -5142,13 +5032,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> MAGENTA_GLAZED_TERRACOTTA = create(key("magenta_glazed_terracotta"));
 
-    /**
-     * {@code minecraft:magenta_harness}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> MAGENTA_HARNESS = create(key("magenta_harness"));
-
     /**
      * {@code minecraft:magenta_shulker_box}
      *
@@ -5541,13 +5424,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> MUSHROOM_STEW = create(key("mushroom_stew"));
 
-    /**
-     * {@code minecraft:music_disc_5}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> MUSIC_DISC_5 = create(key("music_disc_5"));
-
     /**
      * {@code minecraft:music_disc_11}
      *
@@ -5660,13 +5536,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> 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<ItemType> MUSIC_DISC_TEARS = create(key("music_disc_tears"));
-
     /**
      * {@code minecraft:music_disc_wait}
      *
@@ -6129,13 +5998,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> ORANGE_GLAZED_TERRACOTTA = create(key("orange_glazed_terracotta"));
 
-    /**
-     * {@code minecraft:orange_harness}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> ORANGE_HARNESS = create(key("orange_harness"));
-
     /**
      * {@code minecraft:orange_shulker_box}
      *
@@ -6570,13 +6432,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> PINK_GLAZED_TERRACOTTA = create(key("pink_glazed_terracotta"));
 
-    /**
-     * {@code minecraft:pink_harness}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> PINK_HARNESS = create(key("pink_harness"));
-
     /**
      * {@code minecraft:pink_petals}
      *
@@ -7109,13 +6964,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> PURPLE_GLAZED_TERRACOTTA = create(key("purple_glazed_terracotta"));
 
-    /**
-     * {@code minecraft:purple_harness}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> PURPLE_HARNESS = create(key("purple_harness"));
-
     /**
      * {@code minecraft:purple_shulker_box}
      *
@@ -7389,13 +7237,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> RED_GLAZED_TERRACOTTA = create(key("red_glazed_terracotta"));
 
-    /**
-     * {@code minecraft:red_harness}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> RED_HARNESS = create(key("red_harness"));
-
     /**
      * {@code minecraft:red_mushroom}
      *
@@ -7837,13 +7678,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> SHIELD = create(key("shield"));
 
-    /**
-     * {@code minecraft:short_dry_grass}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> SHORT_DRY_GRASS = create(key("short_dry_grass"));
-
     /**
      * {@code minecraft:short_grass}
      *
@@ -8719,13 +8553,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> TADPOLE_SPAWN_EGG = create(key("tadpole_spawn_egg"));
 
-    /**
-     * {@code minecraft:tall_dry_grass}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> TALL_DRY_GRASS = create(key("tall_dry_grass"));
-
     /**
      * {@code minecraft:tall_grass}
      *
@@ -8747,20 +8574,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> TERRACOTTA = create(key("terracotta"));
 
-    /**
-     * {@code minecraft:test_block}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> TEST_BLOCK = create(key("test_block"));
-
-    /**
-     * {@code minecraft:test_instance_block}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> TEST_INSTANCE_BLOCK = create(key("test_instance_block"));
-
     /**
      * {@code minecraft:tide_armor_trim_smithing_template}
      *
@@ -9615,13 +9428,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> WHITE_GLAZED_TERRACOTTA = create(key("white_glazed_terracotta"));
 
-    /**
-     * {@code minecraft:white_harness}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> WHITE_HARNESS = create(key("white_harness"));
-
     /**
      * {@code minecraft:white_shulker_box}
      *
@@ -9671,13 +9477,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> WILD_ARMOR_TRIM_SMITHING_TEMPLATE = create(key("wild_armor_trim_smithing_template"));
 
-    /**
-     * {@code minecraft:wildflowers}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> WILDFLOWERS = create(key("wildflowers"));
-
     /**
      * {@code minecraft:wind_charge}
      *
@@ -9846,13 +9645,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> YELLOW_GLAZED_TERRACOTTA = create(key("yellow_glazed_terracotta"));
 
-    /**
-     * {@code minecraft:yellow_harness}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> YELLOW_HARNESS = create(key("yellow_harness"));
-
     /**
      * {@code minecraft:yellow_shulker_box}
      *

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

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

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

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

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

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

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

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

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

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

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

@@ -7,6 +7,7 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.Sound;
+import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -22,8 +23,9 @@ import org.jspecify.annotations.NullMarked;
         "unused",
         "SpellCheckingInspection"
 })
+@GeneratedFrom("1.21.4")
 @NullMarked
-@GeneratedFrom("1.21.6")
+@ApiStatus.Experimental
 public final class SoundEventKeys {
     /**
      * {@code minecraft:ambient.basalt_deltas.additions}
@@ -879,20 +881,6 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> BLOCK_BUBBLE_COLUMN_WHIRLPOOL_INSIDE = create(key("block.bubble_column.whirlpool_inside"));
 
-    /**
-     * {@code minecraft:block.cactus_flower.break}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> BLOCK_CACTUS_FLOWER_BREAK = create(key("block.cactus_flower.break"));
-
-    /**
-     * {@code minecraft:block.cactus_flower.place}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> BLOCK_CACTUS_FLOWER_PLACE = create(key("block.cactus_flower.place"));
-
     /**
      * {@code minecraft:block.cake.add_candle}
      *
@@ -1740,13 +1728,6 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> BLOCK_CROP_BREAK = create(key("block.crop.break"));
 
-    /**
-     * {@code minecraft:block.deadbush.idle}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> BLOCK_DEADBUSH_IDLE = create(key("block.deadbush.idle"));
-
     /**
      * {@code minecraft:block.decorated_pot.break}
      *
@@ -1929,62 +1910,6 @@ 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}
      *
@@ -2020,13 +1945,6 @@ 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}
      *
@@ -2132,13 +2050,6 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> BLOCK_FIRE_EXTINGUISH = create(key("block.fire.extinguish"));
 
-    /**
-     * {@code minecraft:block.firefly_bush.idle}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> BLOCK_FIREFLY_BUSH_IDLE = create(key("block.firefly_bush.idle"));
-
     /**
      * {@code minecraft:block.flowering_azalea.break}
      *
@@ -2601,41 +2512,6 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> BLOCK_HONEY_BLOCK_STEP = create(key("block.honey_block.step"));
 
-    /**
-     * {@code minecraft:block.iron.break}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> BLOCK_IRON_BREAK = create(key("block.iron.break"));
-
-    /**
-     * {@code minecraft:block.iron.fall}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> BLOCK_IRON_FALL = create(key("block.iron.fall"));
-
-    /**
-     * {@code minecraft:block.iron.hit}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> BLOCK_IRON_HIT = create(key("block.iron.hit"));
-
-    /**
-     * {@code minecraft:block.iron.place}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> BLOCK_IRON_PLACE = create(key("block.iron.place"));
-
-    /**
-     * {@code minecraft:block.iron.step}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> BLOCK_IRON_STEP = create(key("block.iron.step"));
-
     /**
      * {@code minecraft:block.iron_door.close}
      *
@@ -2769,41 +2645,6 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> BLOCK_LAVA_POP = create(key("block.lava.pop"));
 
-    /**
-     * {@code minecraft:block.leaf_litter.break}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> BLOCK_LEAF_LITTER_BREAK = create(key("block.leaf_litter.break"));
-
-    /**
-     * {@code minecraft:block.leaf_litter.fall}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> BLOCK_LEAF_LITTER_FALL = create(key("block.leaf_litter.fall"));
-
-    /**
-     * {@code minecraft:block.leaf_litter.hit}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> BLOCK_LEAF_LITTER_HIT = create(key("block.leaf_litter.hit"));
-
-    /**
-     * {@code minecraft:block.leaf_litter.place}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> BLOCK_LEAF_LITTER_PLACE = create(key("block.leaf_litter.place"));
-
-    /**
-     * {@code minecraft:block.leaf_litter.step}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> BLOCK_LEAF_LITTER_STEP = create(key("block.leaf_litter.step"));
-
     /**
      * {@code minecraft:block.lever.click}
      *
@@ -4155,13 +3996,6 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> BLOCK_SAND_HIT = create(key("block.sand.hit"));
 
-    /**
-     * {@code minecraft:block.sand.idle}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> BLOCK_SAND_IDLE = create(key("block.sand.idle"));
-
     /**
      * {@code minecraft:block.sand.place}
      *
@@ -7263,34 +7097,6 @@ 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}
      *
@@ -7536,62 +7342,6 @@ 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}
      *
@@ -7956,6 +7706,20 @@ 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}
      *
@@ -9006,6 +8770,13 @@ 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}
      *
@@ -10448,6 +10219,13 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> ENTITY_WOLF_GROWL = create(key("entity.wolf.growl"));
 
+    /**
+     * {@code minecraft:entity.wolf.howl}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_WOLF_HOWL = create(key("entity.wolf.howl"));
+
     /**
      * {@code minecraft:entity.wolf.hurt}
      *
@@ -10483,258 +10261,6 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> ENTITY_WOLF_WHINE = create(key("entity.wolf.whine"));
 
-    /**
-     * {@code minecraft:entity.wolf_angry.ambient}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_ANGRY_AMBIENT = create(key("entity.wolf_angry.ambient"));
-
-    /**
-     * {@code minecraft:entity.wolf_angry.death}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_ANGRY_DEATH = create(key("entity.wolf_angry.death"));
-
-    /**
-     * {@code minecraft:entity.wolf_angry.growl}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_ANGRY_GROWL = create(key("entity.wolf_angry.growl"));
-
-    /**
-     * {@code minecraft:entity.wolf_angry.hurt}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_ANGRY_HURT = create(key("entity.wolf_angry.hurt"));
-
-    /**
-     * {@code minecraft:entity.wolf_angry.pant}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_ANGRY_PANT = create(key("entity.wolf_angry.pant"));
-
-    /**
-     * {@code minecraft:entity.wolf_angry.whine}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_ANGRY_WHINE = create(key("entity.wolf_angry.whine"));
-
-    /**
-     * {@code minecraft:entity.wolf_big.ambient}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_BIG_AMBIENT = create(key("entity.wolf_big.ambient"));
-
-    /**
-     * {@code minecraft:entity.wolf_big.death}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_BIG_DEATH = create(key("entity.wolf_big.death"));
-
-    /**
-     * {@code minecraft:entity.wolf_big.growl}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_BIG_GROWL = create(key("entity.wolf_big.growl"));
-
-    /**
-     * {@code minecraft:entity.wolf_big.hurt}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_BIG_HURT = create(key("entity.wolf_big.hurt"));
-
-    /**
-     * {@code minecraft:entity.wolf_big.pant}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_BIG_PANT = create(key("entity.wolf_big.pant"));
-
-    /**
-     * {@code minecraft:entity.wolf_big.whine}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_BIG_WHINE = create(key("entity.wolf_big.whine"));
-
-    /**
-     * {@code minecraft:entity.wolf_cute.ambient}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_CUTE_AMBIENT = create(key("entity.wolf_cute.ambient"));
-
-    /**
-     * {@code minecraft:entity.wolf_cute.death}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_CUTE_DEATH = create(key("entity.wolf_cute.death"));
-
-    /**
-     * {@code minecraft:entity.wolf_cute.growl}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_CUTE_GROWL = create(key("entity.wolf_cute.growl"));
-
-    /**
-     * {@code minecraft:entity.wolf_cute.hurt}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_CUTE_HURT = create(key("entity.wolf_cute.hurt"));
-
-    /**
-     * {@code minecraft:entity.wolf_cute.pant}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_CUTE_PANT = create(key("entity.wolf_cute.pant"));
-
-    /**
-     * {@code minecraft:entity.wolf_cute.whine}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_CUTE_WHINE = create(key("entity.wolf_cute.whine"));
-
-    /**
-     * {@code minecraft:entity.wolf_grumpy.ambient}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_GRUMPY_AMBIENT = create(key("entity.wolf_grumpy.ambient"));
-
-    /**
-     * {@code minecraft:entity.wolf_grumpy.death}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_GRUMPY_DEATH = create(key("entity.wolf_grumpy.death"));
-
-    /**
-     * {@code minecraft:entity.wolf_grumpy.growl}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_GRUMPY_GROWL = create(key("entity.wolf_grumpy.growl"));
-
-    /**
-     * {@code minecraft:entity.wolf_grumpy.hurt}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_GRUMPY_HURT = create(key("entity.wolf_grumpy.hurt"));
-
-    /**
-     * {@code minecraft:entity.wolf_grumpy.pant}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_GRUMPY_PANT = create(key("entity.wolf_grumpy.pant"));
-
-    /**
-     * {@code minecraft:entity.wolf_grumpy.whine}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_GRUMPY_WHINE = create(key("entity.wolf_grumpy.whine"));
-
-    /**
-     * {@code minecraft:entity.wolf_puglin.ambient}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_PUGLIN_AMBIENT = create(key("entity.wolf_puglin.ambient"));
-
-    /**
-     * {@code minecraft:entity.wolf_puglin.death}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_PUGLIN_DEATH = create(key("entity.wolf_puglin.death"));
-
-    /**
-     * {@code minecraft:entity.wolf_puglin.growl}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_PUGLIN_GROWL = create(key("entity.wolf_puglin.growl"));
-
-    /**
-     * {@code minecraft:entity.wolf_puglin.hurt}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_PUGLIN_HURT = create(key("entity.wolf_puglin.hurt"));
-
-    /**
-     * {@code minecraft:entity.wolf_puglin.pant}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_PUGLIN_PANT = create(key("entity.wolf_puglin.pant"));
-
-    /**
-     * {@code minecraft:entity.wolf_puglin.whine}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_PUGLIN_WHINE = create(key("entity.wolf_puglin.whine"));
-
-    /**
-     * {@code minecraft:entity.wolf_sad.ambient}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_SAD_AMBIENT = create(key("entity.wolf_sad.ambient"));
-
-    /**
-     * {@code minecraft:entity.wolf_sad.death}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_SAD_DEATH = create(key("entity.wolf_sad.death"));
-
-    /**
-     * {@code minecraft:entity.wolf_sad.growl}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_SAD_GROWL = create(key("entity.wolf_sad.growl"));
-
-    /**
-     * {@code minecraft:entity.wolf_sad.hurt}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_SAD_HURT = create(key("entity.wolf_sad.hurt"));
-
-    /**
-     * {@code minecraft:entity.wolf_sad.pant}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_SAD_PANT = create(key("entity.wolf_sad.pant"));
-
-    /**
-     * {@code minecraft:entity.wolf_sad.whine}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<Sound> ENTITY_WOLF_SAD_WHINE = create(key("entity.wolf_sad.whine"));
-
     /**
      * {@code minecraft:entity.zoglin.ambient}
      *
@@ -11442,13 +10968,6 @@ 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}
      *
@@ -11456,34 +10975,6 @@ 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}
      *
@@ -11526,20 +11017,6 @@ 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}
      *
@@ -12002,13 +11479,6 @@ 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-generator/generated/io/papermc/paper/registry/keys/StructureKeys.java

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -2,16 +2,13 @@ package io.papermc.generator.types;
 
 import com.squareup.javapoet.JavaFile;
 import com.squareup.javapoet.TypeSpec;
+
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
-import org.jspecify.annotations.NullMarked;
 
-@NullMarked
 public abstract class SimpleGenerator implements SourceGenerator {
 
-    public static final String INDENT_UNIT = "    ";
-
     protected final String className;
     protected final String packageName;
 
@@ -22,15 +19,14 @@ public abstract class SimpleGenerator implements SourceGenerator {
 
     protected abstract TypeSpec getTypeSpec();
 
-    protected JavaFile.Builder file(JavaFile.Builder builder) {
+    protected abstract JavaFile.Builder file(JavaFile.Builder builder);
-        return builder;
-    }
 
     @Override
     public void writeToFile(Path parent) throws IOException {
+
         JavaFile.Builder builder = JavaFile.builder(this.packageName, this.getTypeSpec());
         this.file(builder)
-            .indent(INDENT_UNIT)
+            .indent("    ")
             .skipJavaLangImports(true);
 
         builder.build().writeTo(parent, StandardCharsets.UTF_8);

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

@@ -2,9 +2,7 @@ package io.papermc.generator.types;
 
 import java.io.IOException;
 import java.nio.file.Path;
-import org.jspecify.annotations.NullMarked;
 
-@NullMarked
 public interface SourceGenerator {
 
     void writeToFile(Path parent) throws IOException;

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

@@ -3,6 +3,7 @@ package io.papermc.generator.types.goal;
 import com.destroystokyo.paper.entity.ai.GoalKey;
 import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.FieldSpec;
+import com.squareup.javapoet.JavaFile;
 import com.squareup.javapoet.MethodSpec;
 import com.squareup.javapoet.ParameterSpec;
 import com.squareup.javapoet.ParameterizedTypeName;
@@ -15,29 +16,28 @@ import io.papermc.generator.types.SimpleGenerator;
 import io.papermc.generator.utils.Annotations;
 import io.papermc.generator.utils.Formatting;
 import io.papermc.generator.utils.Javadocs;
-import io.papermc.typewriter.util.ClassHelper;
 import java.util.Comparator;
 import java.util.List;
-import java.util.stream.Stream;
 import net.minecraft.world.entity.ai.goal.Goal;
-import net.minecraft.world.entity.ai.goal.GoalSelector;
 import net.minecraft.world.entity.ai.goal.WrappedGoal;
 import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Mob;
-import org.jspecify.annotations.NullMarked;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.framework.qual.DefaultQualifier;
+import org.jetbrains.annotations.Nullable;
 
 import static javax.lang.model.element.Modifier.FINAL;
 import static javax.lang.model.element.Modifier.PRIVATE;
 import static javax.lang.model.element.Modifier.PUBLIC;
 import static javax.lang.model.element.Modifier.STATIC;
 
-@NullMarked
+@DefaultQualifier(NonNull.class)
 public class MobGoalGenerator extends SimpleGenerator {
 
-    private static final String CLASS_HEADER = Javadocs.getVersionDependentClassHeader("keys", "Mob Goals");
+    private static final String CLASS_HEADER = Javadocs.getVersionDependentClassHeader("Mob Goals");
 
-    public MobGoalGenerator(String className, String packageName) {
+    public MobGoalGenerator(final String keysClassName, final String pkg) {
-        super(className, packageName);
+        super(keysClassName, pkg);
     }
 
     @Override
@@ -51,8 +51,9 @@ public class MobGoalGenerator extends SimpleGenerator {
             .addJavadoc(CLASS_HEADER);
 
         TypeName mobType = ParameterizedTypeName.get(ClassName.get(Class.class), type);
+        TypeName keyType = TypeName.get(String.class);
 
-        ParameterSpec keyParam = ParameterSpec.builder(String.class, "key", FINAL).build();
+        ParameterSpec keyParam = ParameterSpec.builder(keyType, "key", FINAL).build();
         ParameterSpec typeParam = ParameterSpec.builder(mobType, "type", FINAL).build();
         MethodSpec.Builder createMethod = MethodSpec.methodBuilder("create")
             .addModifiers(PRIVATE, STATIC)
@@ -67,25 +68,33 @@ public class MobGoalGenerator extends SimpleGenerator {
             classes = scanResult.getSubclasses(Goal.class.getName()).loadClasses(Goal.class);
         }
 
-        Stream<GoalKey<Mob>> vanillaGoals = classes.stream()
+        List<GoalKey<Mob>> vanillaNames = classes.stream()
             .filter(clazz -> !java.lang.reflect.Modifier.isAbstract(clazz.getModifiers()))
-            .filter(clazz -> !clazz.isAnonymousClass() || ClassHelper.getTopLevelClass(clazz) != GoalSelector.class)
             .filter(clazz -> !WrappedGoal.class.equals(clazz)) // TODO - properly fix
-            .map(MobGoalNames::getKey)
+            .map(goalClass -> MobGoalNames.getKey(goalClass.getName(), goalClass))
+            .filter((key) -> !MobGoalNames.isIgnored(key.getNamespacedKey().getKey()))
             .sorted(Comparator.<GoalKey<?>, String>comparing(o -> o.getEntityClass().getSimpleName())
                 .thenComparing(vanillaGoalKey -> vanillaGoalKey.getNamespacedKey().getKey())
-            );
+            )
+            .toList();
 
-        vanillaGoals.forEach(goalKey -> {
-            String keyPath = goalKey.getNamespacedKey().getKey();
-            String fieldName = Formatting.formatKeyAsField(keyPath);
 
+        for (final GoalKey<?> goalKey : vanillaNames) {
             TypeName typedKey = ParameterizedTypeName.get(GoalKey.class, goalKey.getEntityClass());
+            NamespacedKey key = goalKey.getNamespacedKey();
+
+            String keyPath = key.getKey();
+            String fieldName = Formatting.formatKeyAsField(keyPath);
             FieldSpec.Builder fieldBuilder = FieldSpec.builder(typedKey, fieldName, PUBLIC, STATIC, FINAL)
                 .initializer("$N($S, $T.class)", createMethod.build(), keyPath, goalKey.getEntityClass());
             typeBuilder.addField(fieldBuilder.build());
-        });
+        }
 
         return typeBuilder.addMethod(createMethod.build()).build();
     }
+
+    @Override
+    protected JavaFile.Builder file(JavaFile.Builder builder) {
+        return builder;
+    }
 }

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

@@ -0,0 +1,336 @@
+package io.papermc.generator.types.goal;
+
+import com.destroystokyo.paper.entity.RangedEntity;
+import com.destroystokyo.paper.entity.ai.GoalKey;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+import net.minecraft.world.entity.FlyingMob;
+import net.minecraft.world.entity.PathfinderMob;
+import net.minecraft.world.entity.TamableAnimal;
+import net.minecraft.world.entity.ai.goal.Goal;
+import net.minecraft.world.entity.ambient.AmbientCreature;
+import net.minecraft.world.entity.animal.AbstractFish;
+import net.minecraft.world.entity.animal.AbstractGolem;
+import net.minecraft.world.entity.animal.AbstractSchoolingFish;
+import net.minecraft.world.entity.animal.Animal;
+import net.minecraft.world.entity.animal.Pufferfish;
+import net.minecraft.world.entity.animal.ShoulderRidingEntity;
+import net.minecraft.world.entity.animal.SnowGolem;
+import net.minecraft.world.entity.animal.WaterAnimal;
+import net.minecraft.world.entity.animal.horse.AbstractChestedHorse;
+import net.minecraft.world.entity.boss.wither.WitherBoss;
+import net.minecraft.world.entity.monster.AbstractIllager;
+import net.minecraft.world.entity.monster.EnderMan;
+import net.minecraft.world.entity.monster.PatrollingMonster;
+import net.minecraft.world.entity.monster.RangedAttackMob;
+import net.minecraft.world.entity.monster.SpellcasterIllager;
+import net.minecraft.world.entity.monster.ZombifiedPiglin;
+import net.minecraft.world.entity.monster.piglin.AbstractPiglin;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.AbstractHorse;
+import org.bukkit.entity.AbstractSkeleton;
+import org.bukkit.entity.AbstractVillager;
+import org.bukkit.entity.Ageable;
+import org.bukkit.entity.Ambient;
+import org.bukkit.entity.Animals;
+import org.bukkit.entity.Bat;
+import org.bukkit.entity.Bee;
+import org.bukkit.entity.Blaze;
+import org.bukkit.entity.Cat;
+import org.bukkit.entity.CaveSpider;
+import org.bukkit.entity.ChestedHorse;
+import org.bukkit.entity.Chicken;
+import org.bukkit.entity.Cod;
+import org.bukkit.entity.Cow;
+import org.bukkit.entity.Creature;
+import org.bukkit.entity.Creeper;
+import org.bukkit.entity.Dolphin;
+import org.bukkit.entity.Donkey;
+import org.bukkit.entity.Drowned;
+import org.bukkit.entity.ElderGuardian;
+import org.bukkit.entity.EnderDragon;
+import org.bukkit.entity.Enderman;
+import org.bukkit.entity.Endermite;
+import org.bukkit.entity.Evoker;
+import org.bukkit.entity.Fish;
+import org.bukkit.entity.Flying;
+import org.bukkit.entity.Fox;
+import org.bukkit.entity.Ghast;
+import org.bukkit.entity.Giant;
+import org.bukkit.entity.Golem;
+import org.bukkit.entity.Guardian;
+import org.bukkit.entity.Hoglin;
+import org.bukkit.entity.Horse;
+import org.bukkit.entity.Husk;
+import org.bukkit.entity.Illager;
+import org.bukkit.entity.Illusioner;
+import org.bukkit.entity.IronGolem;
+import org.bukkit.entity.Llama;
+import org.bukkit.entity.MagmaCube;
+import org.bukkit.entity.Mob;
+import org.bukkit.entity.Monster;
+import org.bukkit.entity.Mule;
+import org.bukkit.entity.MushroomCow;
+import org.bukkit.entity.Ocelot;
+import org.bukkit.entity.Panda;
+import org.bukkit.entity.Parrot;
+import org.bukkit.entity.Phantom;
+import org.bukkit.entity.Pig;
+import org.bukkit.entity.PigZombie;
+import org.bukkit.entity.Piglin;
+import org.bukkit.entity.PiglinAbstract;
+import org.bukkit.entity.PiglinBrute;
+import org.bukkit.entity.Pillager;
+import org.bukkit.entity.PolarBear;
+import org.bukkit.entity.PufferFish;
+import org.bukkit.entity.Rabbit;
+import org.bukkit.entity.Raider;
+import org.bukkit.entity.Ravager;
+import org.bukkit.entity.Salmon;
+import org.bukkit.entity.Sheep;
+import org.bukkit.entity.Shulker;
+import org.bukkit.entity.Silverfish;
+import org.bukkit.entity.Skeleton;
+import org.bukkit.entity.SkeletonHorse;
+import org.bukkit.entity.Slime;
+import org.bukkit.entity.Snowman;
+import org.bukkit.entity.Spellcaster;
+import org.bukkit.entity.Spider;
+import org.bukkit.entity.Squid;
+import org.bukkit.entity.Stray;
+import org.bukkit.entity.Strider;
+import org.bukkit.entity.Tameable;
+import org.bukkit.entity.TraderLlama;
+import org.bukkit.entity.TropicalFish;
+import org.bukkit.entity.Turtle;
+import org.bukkit.entity.Vex;
+import org.bukkit.entity.Villager;
+import org.bukkit.entity.Vindicator;
+import org.bukkit.entity.WanderingTrader;
+import org.bukkit.entity.WaterMob;
+import org.bukkit.entity.Witch;
+import org.bukkit.entity.Wither;
+import org.bukkit.entity.WitherSkeleton;
+import org.bukkit.entity.Wolf;
+import org.bukkit.entity.Zoglin;
+import org.bukkit.entity.Zombie;
+import org.bukkit.entity.ZombieHorse;
+import org.bukkit.entity.ZombieVillager;
+
+import java.lang.reflect.Constructor;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+public class MobGoalNames {
+
+    private static final Map<Class<? extends Goal>, Class<? extends Mob>> entityClassCache = new HashMap<>();
+    public static final Map<Class<? extends net.minecraft.world.entity.Mob>, Class<? extends Mob>> bukkitMap = new HashMap<>();
+
+
+    static {
+        //<editor-fold defaultstate="collapsed" desc="bukkitMap Entities">
+        bukkitMap.put(net.minecraft.world.entity.Mob.class, Mob.class);
+        bukkitMap.put(net.minecraft.world.entity.AgeableMob.class, Ageable.class);
+        bukkitMap.put(AmbientCreature.class, Ambient.class);
+        bukkitMap.put(Animal.class, Animals.class);
+        bukkitMap.put(net.minecraft.world.entity.ambient.Bat.class, Bat.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.Bee.class, Bee.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.Blaze.class, Blaze.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.Cat.class, Cat.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.CaveSpider.class, CaveSpider.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.Chicken.class, Chicken.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.Cod.class, Cod.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.Cow.class, Cow.class);
+        bukkitMap.put(PathfinderMob.class, Creature.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.Creeper.class, Creeper.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.Dolphin.class, Dolphin.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.Drowned.class, Drowned.class);
+        bukkitMap.put(net.minecraft.world.entity.boss.enderdragon.EnderDragon.class, EnderDragon.class);
+        bukkitMap.put(EnderMan.class, Enderman.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.Endermite.class, Endermite.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.Evoker.class, Evoker.class);
+        bukkitMap.put(AbstractFish.class, Fish.class);
+        bukkitMap.put(AbstractSchoolingFish.class, io.papermc.paper.entity.SchoolableFish.class);
+        bukkitMap.put(FlyingMob.class, Flying.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.Fox.class, Fox.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.Ghast.class, Ghast.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.Giant.class, Giant.class);
+        bukkitMap.put(AbstractGolem.class, Golem.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.Guardian.class, Guardian.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.ElderGuardian.class, ElderGuardian.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.horse.Horse.class, Horse.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.horse.AbstractHorse.class, AbstractHorse.class);
+        bukkitMap.put(AbstractChestedHorse.class, ChestedHorse.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.horse.Donkey.class, Donkey.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.horse.Mule.class, Mule.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.horse.SkeletonHorse.class, SkeletonHorse.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.horse.ZombieHorse.class, ZombieHorse.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.camel.Camel.class, org.bukkit.entity.Camel.class);
+        bukkitMap.put(AbstractIllager.class, Illager.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.Illusioner.class, Illusioner.class);
+        bukkitMap.put(SpellcasterIllager.class, Spellcaster.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.IronGolem.class, IronGolem.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.horse.Llama.class, Llama.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.horse.TraderLlama.class, TraderLlama.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.MagmaCube.class, MagmaCube.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.Monster.class, Monster.class);
+        bukkitMap.put(PatrollingMonster.class, Raider.class); // close enough
+        bukkitMap.put(net.minecraft.world.entity.animal.MushroomCow.class, MushroomCow.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.Ocelot.class, Ocelot.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.Panda.class, Panda.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.Parrot.class, Parrot.class);
+        bukkitMap.put(ShoulderRidingEntity.class, Parrot.class); // close enough
+        bukkitMap.put(net.minecraft.world.entity.monster.Phantom.class, Phantom.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.Pig.class, Pig.class);
+        bukkitMap.put(ZombifiedPiglin.class, PigZombie.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.Pillager.class, Pillager.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.PolarBear.class, PolarBear.class);
+        bukkitMap.put(Pufferfish.class, PufferFish.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.Rabbit.class, Rabbit.class);
+        bukkitMap.put(net.minecraft.world.entity.raid.Raider.class, Raider.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.Ravager.class, Ravager.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.Salmon.class, Salmon.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.Sheep.class, Sheep.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.Shulker.class, Shulker.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.Silverfish.class, Silverfish.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.Skeleton.class, Skeleton.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.AbstractSkeleton.class, AbstractSkeleton.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.Stray.class, Stray.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.WitherSkeleton.class, WitherSkeleton.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.Slime.class, Slime.class);
+        bukkitMap.put(SnowGolem.class, Snowman.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.Spider.class, Spider.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.Squid.class, Squid.class);
+        bukkitMap.put(TamableAnimal.class, Tameable.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.TropicalFish.class, TropicalFish.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.Turtle.class, Turtle.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.Vex.class, Vex.class);
+        bukkitMap.put(net.minecraft.world.entity.npc.Villager.class, Villager.class);
+        bukkitMap.put(net.minecraft.world.entity.npc.AbstractVillager.class, AbstractVillager.class);
+        bukkitMap.put(net.minecraft.world.entity.npc.WanderingTrader.class, WanderingTrader.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.Vindicator.class, Vindicator.class);
+        bukkitMap.put(WaterAnimal.class, WaterMob.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.Witch.class, Witch.class);
+        bukkitMap.put(WitherBoss.class, Wither.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.Wolf.class, Wolf.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.Zombie.class, Zombie.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.Husk.class, Husk.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.ZombieVillager.class, ZombieVillager.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.hoglin.Hoglin.class, Hoglin.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.piglin.Piglin.class, Piglin.class);
+        bukkitMap.put(AbstractPiglin.class, PiglinAbstract.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.piglin.PiglinBrute.class, PiglinBrute.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.Strider.class, Strider.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.Zoglin.class, Zoglin.class);
+        bukkitMap.put(net.minecraft.world.entity.GlowSquid.class, org.bukkit.entity.GlowSquid.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.axolotl.Axolotl.class, org.bukkit.entity.Axolotl.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.goat.Goat.class, org.bukkit.entity.Goat.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.frog.Frog.class, org.bukkit.entity.Frog.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.frog.Tadpole.class, org.bukkit.entity.Tadpole.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.warden.Warden.class, org.bukkit.entity.Warden.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.allay.Allay.class, org.bukkit.entity.Allay.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.sniffer.Sniffer.class, org.bukkit.entity.Sniffer.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.breeze.Breeze.class, org.bukkit.entity.Breeze.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.armadillo.Armadillo.class, org.bukkit.entity.Armadillo.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.Bogged.class, org.bukkit.entity.Bogged.class);
+        bukkitMap.put(net.minecraft.world.entity.monster.creaking.Creaking.class, org.bukkit.entity.Creaking.class);
+        bukkitMap.put(net.minecraft.world.entity.animal.AgeableWaterCreature.class, org.bukkit.entity.Squid.class); // close enough
+        //</editor-fold>
+    }
+
+    private static final BiMap<String, String> deobfuscationMap = HashBiMap.create();
+    static final Set<String> ignored = new HashSet<>();
+
+    static {
+        deobfuscationMap.put("abstract_skeleton_1", "abstract_skeleton_melee");
+
+        ignored.add("goal_selector_1");
+        ignored.add("goal_selector_2");
+        ignored.add("selector_1");
+        ignored.add("selector_2");
+        ignored.add("wrapped");
+    }
+
+    public static String getUsableName(String name) {
+        final String original = name;
+        name = name.substring(name.lastIndexOf(".") + 1);
+        boolean flag = false;
+        // inner classes
+        if (name.contains("$")) {
+            String cut = name.substring(name.indexOf("$") + 1);
+            if (cut.length() <= 2) {
+                name = name.replace("Entity", "");
+                name = name.replace("$", "_");
+                flag = true;
+            } else {
+                // mapped, wooo
+                name = cut;
+            }
+        }
+
+        name = name.replace("PathfinderGoal", "");
+        name = name.replace("TargetGoal", "");
+        name = name.replace("Goal", "");
+        StringBuilder sb = new StringBuilder();
+        for (char c : name.toCharArray()) {
+            if (c >= 'A' && c <= 'Z') {
+                sb.append("_");
+                sb.append(Character.toLowerCase(c));
+            } else {
+                sb.append(c);
+            }
+        }
+        name = sb.toString();
+        name = name.replaceFirst("_", "");
+
+        if (flag && !deobfuscationMap.containsKey(name.toLowerCase(Locale.ROOT)) && !ignored.contains(name)) {
+            System.out.println("need to map " + original + " (" + name.toLowerCase(Locale.ROOT) + ")");
+        }
+
+        // did we rename this key?
+        return deobfuscationMap.getOrDefault(name, name);
+    }
+
+    public static boolean isIgnored(String name) {
+        return ignored.contains(name);
+    }
+
+
+    public static <T extends Mob> GoalKey<T> getKey(String clazzName, Class<? extends Goal> goalClass) {
+        String name = getUsableName(clazzName);
+        if (MobGoalNames.isIgnored(name)) {
+            //noinspection unchecked
+            return (GoalKey<T>) GoalKey.of(Mob.class, NamespacedKey.minecraft(name));
+        }
+        return GoalKey.of(getEntity(goalClass), NamespacedKey.minecraft(name));
+    }
+
+    public static <T extends Mob> Class<T> getEntity(Class<? extends Goal> goalClass) {
+        //noinspection unchecked
+        return (Class<T>) entityClassCache.computeIfAbsent(goalClass, key -> {
+            for (Constructor<?> ctor : key.getDeclaredConstructors()) {
+                for (int i = 0; i < ctor.getParameterCount(); i++) {
+                    Class<?> param = ctor.getParameterTypes()[i];
+                    if (net.minecraft.world.entity.Mob.class.isAssignableFrom(param)) {
+                        //noinspection unchecked
+                        return toBukkitClass((Class<? extends net.minecraft.world.entity.Mob>) param);
+                    } else if (RangedAttackMob.class.isAssignableFrom(param)) {
+                        return RangedEntity.class;
+                    }
+                }
+            }
+            throw new RuntimeException("Can't figure out applicable entity for mob goal " + goalClass); // maybe just return EntityInsentient?
+        });
+    }
+
+    public static Class<? extends Mob> toBukkitClass(Class<? extends net.minecraft.world.entity.Mob> nmsClass) {
+        Class<? extends Mob> bukkitClass = bukkitMap.get(nmsClass);
+        if (bukkitClass == null) {
+            throw new RuntimeException("Can't figure out applicable bukkit entity for nms entity " + nmsClass); // maybe just return Mob?
+        }
+        return bukkitClass;
+    }
+}

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

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

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

@@ -1,4 +1,4 @@
-package io.papermc.generator.utils.experimental;
+package io.papermc.generator.utils;
 
 import com.mojang.serialization.Lifecycle;
 import io.papermc.generator.Main;
@@ -8,20 +8,21 @@ import net.minecraft.core.HolderGetter;
 import net.minecraft.core.Registry;
 import net.minecraft.data.worldgen.BootstrapContext;
 import net.minecraft.resources.ResourceKey;
-import org.jspecify.annotations.NullMarked;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.framework.qual.DefaultQualifier;
 
-@NullMarked
+@DefaultQualifier(NonNull.class)
 public record CollectingContext<T>(Set<ResourceKey<T>> registered,
                                    Registry<T> registry) implements BootstrapContext<T> {
 
     @Override
-    public Holder.Reference<T> register(ResourceKey<T> key, T value, Lifecycle lifecycle) {
+    public Holder.Reference<T> register(final ResourceKey<T> resourceKey, final @NonNull T t, final Lifecycle lifecycle) {
-        this.registered.add(key);
+        this.registered.add(resourceKey);
-        return Holder.Reference.createStandAlone(this.registry, key);
+        return Holder.Reference.createStandAlone(this.registry, resourceKey);
     }
 
     @Override
-    public <S> HolderGetter<S> lookup(ResourceKey<? extends Registry<? extends S>> key) {
+    public <S> HolderGetter<S> lookup(final ResourceKey<? extends Registry<? extends S>> resourceKey) {
-        return Main.REGISTRY_ACCESS.lookupOrThrow(key);
+        return Main.REGISTRY_ACCESS.lookupOrThrow(resourceKey);
     }
 }

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

@@ -0,0 +1,59 @@
+package io.papermc.generator.utils;
+
+import java.util.Optional;
+import org.apache.commons.lang3.math.NumberUtils;
+import java.util.Comparator;
+import java.util.Locale;
+import java.util.OptionalInt;
+import java.util.function.Function;
+import java.util.regex.Pattern;
+
+public final class Formatting {
+
+    private static final Pattern ILLEGAL_FIELD_CHARACTERS = Pattern.compile("[.-/]");
+
+    public static String formatKeyAsField(String path) {
+        return ILLEGAL_FIELD_CHARACTERS.matcher(path.toUpperCase(Locale.ROOT)).replaceAll("_");
+    }
+
+    public static Optional<String> formatTagKey(String tagDir, String resourcePath) {
+        int tagsIndex = resourcePath.indexOf(tagDir);
+        int dotIndex = resourcePath.lastIndexOf('.');
+        if (tagsIndex == -1 || dotIndex == -1) {
+            return Optional.empty();
+        }
+        return Optional.of(resourcePath.substring(tagsIndex + tagDir.length() + 1, dotIndex)); // namespace/tags/registry_key/[tag_key].json
+    }
+
+    public static Comparator<String> ALPHABETIC_KEY_ORDER = alphabeticKeyOrder(path -> path);
+
+    public static <T> Comparator<T> alphabeticKeyOrder(Function<T, String> mapper) {
+        return (o1, o2) -> {
+            String path1 = mapper.apply(o1);
+            String path2 = mapper.apply(o2);
+
+            OptionalInt trailingInt1 = tryParseTrailingInt(path1);
+            OptionalInt trailingInt2 = tryParseTrailingInt(path2);
+
+            if (trailingInt1.isPresent() && trailingInt2.isPresent()) {
+                return Integer.compare(trailingInt1.getAsInt(), trailingInt2.getAsInt());
+            }
+
+            return path1.compareTo(path2);
+        };
+    }
+
+    private static OptionalInt tryParseTrailingInt(String path) {
+        int delimiterIndex = path.lastIndexOf('_');
+        if (delimiterIndex != -1) {
+            String score = path.substring(delimiterIndex + 1);
+            if (NumberUtils.isDigits(score)) {
+                return OptionalInt.of(Integer.parseInt(score));
+            }
+        }
+        return OptionalInt.empty();
+    }
+
+    private Formatting() {
+    }
+}

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

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

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

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

paper-api-generator/src/test/java/io/papermc/generator/MobGoalConverterTest.java

@@ -3,21 +3,21 @@ package io.papermc.generator;
 import io.github.classgraph.ClassGraph;
 import io.github.classgraph.ScanResult;
 import io.papermc.generator.types.goal.MobGoalNames;
-import java.util.ArrayList;
-import java.util.List;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.Mob;
 import org.junit.jupiter.api.Test;
+import java.util.ArrayList;
+import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class MobGoalConverterTest {
 
     @Test
     public void testBukkitMap() {
         final List<Class<Mob>> classes;
-        try (ScanResult scanResult = new ClassGraph().enableClassInfo().whitelistPackages(Entity.class.getPackageName()).scan()) {
+        try (ScanResult scanResult = new ClassGraph().enableAllInfo().whitelistPackages(Entity.class.getPackageName()).scan()) {
             classes = scanResult.getSubclasses(Mob.class.getName()).loadClasses(Mob.class);
         }
 
@@ -25,11 +25,13 @@ public class MobGoalConverterTest {
 
         List<String> missingClasses = new ArrayList<>();
         for (Class<Mob> nmsClass : classes) {
-            if (!MobGoalNames.BUKKIT_BRIDGE.containsKey(nmsClass)) {
+            if (!MobGoalNames.bukkitMap.containsKey(nmsClass)) {
                 missingClasses.add(nmsClass.getCanonicalName());
             }
         }
 
-        assertTrue(missingClasses.isEmpty(), () -> "Missing some entity classes in the bukkit map: " + String.join(", ", missingClasses));
+        if (!missingClasses.isEmpty()) {
+            fail("Missing some entity classes in the bukkit map: " + String.join(", ", missingClasses));
+        }
     }
 }

paper-api-generator/wideners.at

@@ -1,10 +1,6 @@
-public net/minecraft/world/level/material/MapColor MATERIAL_COLORS
-public net/minecraft/world/level/block/state/properties/IntegerProperty min
-
 # for auto-marking experimental stuff
 public net/minecraft/core/RegistrySetBuilder entries
 public net/minecraft/core/RegistrySetBuilder$RegistryStub
 public net/minecraft/data/registries/VanillaRegistries BUILDER
+public net/minecraft/data/registries/WinterDropRegistries BUILDER
 public net/minecraft/data/registries/TradeRebalanceRegistries BUILDER
-public net/minecraft/world/flag/FeatureFlagRegistry names
-public net/minecraft/world/flag/FeatureFlagSet mask

paper-api/build.gradle.kts

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

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

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

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

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

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

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

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

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

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

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

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

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

paper-api/src/main/java/com/destroystokyo/paper/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", 82).lock();
+        .ensureSize("SPAWN_EGGS", 81).lock();
 
     /**
      * Covers all colors of stained glass.
@@ -568,8 +568,8 @@ public class MaterialTags {
             Material.FLINT_AND_STEEL, Material.CARROT_ON_A_STICK, Material.WARPED_FUNGUS_ON_A_STICK,
             Material.BRUSH, Material.CARVED_PUMPKIN, Material.COMPASS, Material.SKELETON_SKULL,
             Material.WITHER_SKELETON_SKULL, Material.PLAYER_HEAD, Material.ZOMBIE_HEAD,
-            Material.CREEPER_HEAD, Material.DRAGON_HEAD, Material.PIGLIN_HEAD, Material.MACE)
+            Material.CREEPER_HEAD, Material.DRAGON_HEAD, Material.PIGLIN_HEAD)
-        .ensureSize("ENCHANTABLE", 76).lock();
+        .ensureSize("ENCHANTABLE", 75).lock();
 
     /**
      * Covers the variants of raw ores.

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

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

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

@@ -1,6 +1,6 @@
 package com.destroystokyo.paper.entity.ai;
 
-import java.util.Objects;
+import com.google.common.base.Objects;
 import java.util.StringJoiner;
 import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Mob;
@@ -15,46 +15,45 @@ import org.jspecify.annotations.Nullable;
 @NullMarked
 public final class GoalKey<T extends Mob> {
 
-    private final Class<T> type;
+    private final Class<T> entityClass;
-    private final NamespacedKey key;
+    private final NamespacedKey namespacedKey;
 
-    private GoalKey(Class<T> type, NamespacedKey key) {
+    private GoalKey(Class<T> entityClass, NamespacedKey namespacedKey) {
-        this.type = type;
+        this.entityClass = entityClass;
-        this.key = key;
+        this.namespacedKey = namespacedKey;
     }
 
     public Class<T> getEntityClass() {
-        return this.type;
+        return this.entityClass;
     }
 
     public NamespacedKey getNamespacedKey() {
-        return this.key;
+        return this.namespacedKey;
     }
 
     @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.type, goalKey.type) &&
+        return Objects.equal(this.entityClass, goalKey.entityClass) &&
-            Objects.equals(this.key, goalKey.key);
+            Objects.equal(this.namespacedKey, goalKey.namespacedKey);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(this.type, this.key);
+        return Objects.hashCode(this.entityClass, this.namespacedKey);
     }
 
     @Override
     public String toString() {
         return new StringJoiner(", ", GoalKey.class.getSimpleName() + "[", "]")
-            .add("type=" + this.type)
+            .add("entityClass=" + this.entityClass)
-            .add("key=" + this.key)
+            .add("namespacedKey=" + this.namespacedKey)
             .toString();
     }
 
-    public static <A extends Mob> GoalKey<A> of(Class<A> type, NamespacedKey key) {
+    public static <A extends Mob> GoalKey<A> of(Class<A> entityClass, NamespacedKey namespacedKey) {
-        return new GoalKey<>(type, key);
+        return new GoalKey<>(entityClass, namespacedKey);
     }
 }

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

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

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

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

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

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

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

@@ -27,9 +27,7 @@ public class EndermanEscapeEvent extends EntityEvent implements Cancellable {
     }
 
     /**
-     * Gets the reason the enderman is trying to escape.
+     * @return The reason the enderman is trying to escape
-     *
-     * @return The reason
      */
     public Reason getReason() {
         return this.reason;
@@ -44,8 +42,7 @@ public class EndermanEscapeEvent extends EntityEvent implements Cancellable {
      * Cancels the escape.
      * <p>
      * If this escape normally had resulted in damage avoidance such as indirect,
-     * the enderman will now take damage. However, this does not change the Enderman's
+     * the enderman will now take damage.
-     * innate immunities or damage behavior like arrows where the damage never happens.
      */
     @Override
     public void setCancelled(final boolean cancel) {
@@ -79,7 +76,7 @@ public class EndermanEscapeEvent extends EntityEvent implements Cancellable {
          */
         STARE,
         /**
-         * Specific case for {@link #CRITICAL_HIT} where the enderman is taking damage by drowning (ex: rain)
+         * Specific case for {@link #CRITICAL_HIT} where the enderman is taking rain damage
          */
         DROWN
     }

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,10 +1,9 @@
 package com.destroystokyo.paper.event.player;
 
-import io.papermc.paper.event.player.AbstractRespawnEvent;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
-import org.bukkit.event.player.PlayerRespawnEvent;
+import org.bukkit.event.player.PlayerEvent;
 import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
@@ -12,31 +11,36 @@ import org.jspecify.annotations.NullMarked;
  * Fired after a player has respawned
  */
 @NullMarked
-public class PlayerPostRespawnEvent extends AbstractRespawnEvent {
+public class PlayerPostRespawnEvent extends PlayerEvent {
 
     private static final HandlerList HANDLER_LIST = new HandlerList();
 
+    private final Location respawnedLocation;
+    private final boolean isBedSpawn;
+
     @ApiStatus.Internal
-    public PlayerPostRespawnEvent(
+    public PlayerPostRespawnEvent(final Player respawnPlayer, final Location respawnedLocation, final boolean isBedSpawn) {
-        final Player respawnPlayer,
+        super(respawnPlayer);
-        final Location respawnLocation,
+        this.respawnedLocation = respawnedLocation;
-        final boolean isBedSpawn,
+        this.isBedSpawn = isBedSpawn;
-        final boolean isAnchorSpawn,
-        final boolean missingRespawnBlock,
-        final PlayerRespawnEvent.RespawnReason respawnReason
-    ) {
-        super(respawnPlayer, respawnLocation, isBedSpawn, isAnchorSpawn, missingRespawnBlock, respawnReason);
     }
 
     /**
-     * Returns the location of the respawned player.
+     * Returns the location of the respawned player
      *
      * @return location of the respawned player
-     * @see #getRespawnLocation()
      */
-    @ApiStatus.Obsolete
     public Location getRespawnedLocation() {
-        return super.getRespawnLocation();
+        return this.respawnedLocation.clone();
+    }
+
+    /**
+     * Checks if the player respawned to their bed
+     *
+     * @return whether the player respawned to their bed
+     */
+    public boolean isBedSpawn() {
+        return this.isBedSpawn;
     }
 
     @Override

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

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

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

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

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

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

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

@@ -119,7 +119,7 @@ public class AsyncTabCompleteEvent extends Event implements Cancellable {
      * the standard process of calling {@link Command#tabComplete(CommandSender, String, String[])}
      * or current player names will not be called.
      * <p>
-     * The passed collection will be cloned to a new {@code List}. You must call {@link #getCompletions()} to mutate from here
+     * The passed collection will be cloned to a new {@code List}. You must call {{@link #getCompletions()}} to mutate from here
      *
      * @param completions the new completions
      */

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

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

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

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

paper-api/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java

@@ -21,24 +21,12 @@ public interface VersionFetcher {
     /**
      * Gets the version message to cache and show to command senders.
      *
-     * @return the message to show when requesting a version
+     * <p>NOTE: This is run in a new thread separate from that of the command processing thread</p>
-     * @apiNote This method may involve a web request which will block the executing thread
-     */
-    Component getVersionMessage();
-
-    /**
-     * Gets the version message to cache and show to command senders.
      *
      * @param serverVersion the current version of the server (will match {@link Bukkit#getVersion()})
      * @return the message to show when requesting a version
-     * @apiNote This method may involve a web request which will block the current thread
-     * @see #getVersionMessage()
-     * @deprecated {@code serverVersion} is not required
      */
-    @Deprecated
+    Component getVersionMessage(String serverVersion);
-    default Component getVersionMessage(String serverVersion) {
-        return getVersionMessage();
-    }
 
     @ApiStatus.Internal
     class DummyVersionFetcher implements VersionFetcher {
@@ -49,7 +37,7 @@ public interface VersionFetcher {
         }
 
         @Override
-        public Component getVersionMessage() {
+        public Component getVersionMessage(final String serverVersion) {
             Bukkit.getLogger().warning("Version provider has not been set, cannot check for updates!");
             Bukkit.getLogger().info("Override the default implementation of org.bukkit.UnsafeValues#getVersionFetcher()");
             new Throwable().printStackTrace();