Fix health capped at their base max health upon join (MC-17876) (#13500)

Co-authored-by: Warrior <50800980+Warriorrrr@users.noreply.github.com>

.checkstyle/checkstyle_base.xml

@@ -0,0 +1,230 @@
+<!DOCTYPE module PUBLIC
+    "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+    "https://checkstyle.org/dtds/configuration_1_3.dtd">
+<module name="Checker">
+    <module name="SuppressionFilter">
+        <property name="file" value="${config_loc}/suppressions.xml"/>
+        <property name="optional" value="false"/>
+    </module>
+
+    <!--Single Suppression Filters-->
+    <module name="io.papermc.checkstyle.filters.BetterSuppressionSingleFilter">
+        <!--Suppresses warnings except for common TYPE_USE that should be on the same line-->
+        <property name="checks" value="AnnotationOnSameLine"/>
+        <property name="messageKey" value="annotation\.same\.line"/>
+        <property name="arguments" value="^(?!(${type_use_annotations}))"/>
+    </module>
+    <module name="io.papermc.checkstyle.filters.BetterSuppressionSingleFilter">
+        <!--Allows @deprecated on packages. Not in the javadoc spec (javadoc warns), but it is still rendered in the deprecation block and list-->
+        <property name="checks" value="InappropriateJavadocBlockTagsOnPackage"/>
+        <property name="messageKey" value="javadoc\.inappropriate\.tag"/>
+        <property name="arguments" value="^deprecated$"/>
+    </module>
+    <module name="SuppressWarningsFilter"/>
+
+    <!--Javadoc Comments-->
+    <module name="JavadocPackage"/>
+    <!--Misc-->
+    <module name="LineEnding"/>
+    <module name="NewlineAtEndOfFile"/>
+    <!--Whitespace-->
+    <module name="FileTabCharacter"/>
+
+    <module name="TreeWalker">
+        <module name="SuppressWarningsHolder"/>
+        <module name="SuppressionXpathFilter">
+            <property name="file" value="${config_loc}/xpath-suppressions.xml"/>
+            <property name="optional" value="false"/>
+        </module>
+        <module name="SuppressionCommentFilter"/>
+
+        <!--Annotations-->
+        <module name="AnnotationOnSameLine">
+            <!--matches all annotations, but most are suppressed in above-->
+            <property name="tokens" value="METHOD_DEF"/>
+        </module>
+        <module name="AnnotationUseStyle"/>
+        <module name="MissingDeprecated"/>
+        <module name="MissingOverrideOnRecordAccessor"/>
+
+        <!--Block Checks-->
+        <module name="AvoidNestedBlocks"/>
+        <module name="EmptyBlock"/>
+        <module name="LeftCurly"/>
+        <module name="RightCurly"/>
+
+        <!--Class Design-->
+        <module name="FinalClass"/>
+        <module name="HideUtilityClassConstructor"/>
+        <module name="InterfaceIsType"/>
+        <module name="OneTopLevelClass"/>
+        <module name="SealedShouldHavePermitsList"/>
+
+        <!--Coding-->
+        <module name="AvoidDoubleBraceInitialization"/>
+        <module name="AvoidNoArgumentSuperConstructorCall"/>
+        <module name="ConstructorsDeclarationGrouping">
+            <property name="orderByIncreasingParameterCount" value="true"/>
+        </module>
+        <module name="CovariantEquals"/>
+        <module name="DeclarationOrder">
+            <property name="ignoreConstructors" value="true"/>
+        </module>
+        <module name="DefaultComesLast"/>
+        <module name="EmptyStatement"/>
+        <module name="EqualsHashCode"/>
+        <module name="ExpressionOverBlockLambda"/>
+        <module name="FallThrough"/>
+        <!-- Use non-final variables as an identifier of old code for now -->
+        <!--<module name="FinalLocalVariable">
+            <property name="validateEnhancedForLoopVariable" value="true"/>
+            <property name="validateUnnamedVariables" value="true"/>
+            <property name="tokens" value="PARAMETER_DEF,VARIABLE_DEF"/>
+        </module>-->
+        <module name="IllegalToken"/> <!--just labels by default-->
+        <module name="IllegalType"/>
+        <module name="PatternVariableAssignment"/>
+        <module name="RequireThis">
+            <property name="validateOnlyOverlapping" value="false"/>
+        </module>
+        <module name="SimplifyBooleanExpression"/>
+        <module name="SimplifyBooleanReturn"/>
+        <module name="StringLiteralEquality"/>
+        <module name="UnnecessaryNullCheckWithInstanceOf"/>
+        <module name="UnnecessarySemicolonAfterOuterTypeDeclaration"/>
+        <module name="UnnecessarySemicolonAfterTypeMemberDeclaration"/>
+        <module name="UnnecessarySemicolonInEnumeration"/>
+        <module name="UnnecessarySemicolonInTryWithResources"/>
+        <module name="UnusedCatchParameterShouldBeUnnamed"/>
+        <module name="UnusedLocalVariable"/>
+        <module name="UnusedPrivateField"/>
+        <module name="UnusedTryResourceShouldBeUnnamed"/>
+        <module name="UseEnhancedSwitch"/>
+        <module name="WhenShouldBeUsed"/>
+
+        <!--Headers--> <!--N/A-->
+
+        <!--Imports-->
+        <module name="AvoidStarImport"/>
+        <module name="CustomImportOrder">
+            <property name="customImportOrderRules" value="THIRD_PARTY_PACKAGE,STATIC"/>
+            <property name="standardPackageRegExp" value="^$"/>
+            <property name="sortImportsInGroupAlphabetically" value="true"/>
+        </module>
+        <module name="IllegalImport">
+            <property name="regexp" value="true"/>
+            <!--checker-qual nullability-->
+            <property name="illegalClasses" value="org\.checkerframework\.checker\.nullness\.qual\.(Nullable|NonNull|DefaultQualifier|MonotonicNonNull)"/>
+            <!--jetbrains nullability-->
+            <property name="illegalClasses" value="org\.jetbrains\.annotations\.(NotNull|Nullable|NotNullByDefault)"/>
+            <!--javax nullability-->
+            <property name="illegalClasses" value="javax\.annotation\.(Nonnull|Nullable)"/>
+            <message key="import.illegal" value="Illegal nullability annotation - {0}, use JSpecify"/>
+        </module>
+        <module name="RedundantImport"/>
+        <module name="UnusedImports"/>
+
+        <!--Javadoc Comments-->
+        <module name="AtclauseOrder">
+            <property name="tagOrder" value="@param, @return, @throws, @see, @deprecated, @hidden"/>
+        </module>
+        <module name="InappropriateJavadocBlockTagsOnField"/>
+        <module name="InappropriateJavadocBlockTagsOnPackage"/>
+        <module name="InappropriateJavadocBlockTagsOnType"/>
+        <module name="InvalidJavadocPosition"/>
+        <module name="JavadocBlockTagLocation"/>
+        <module name="JavadocContentLocation"/>
+        <module name="JavadocEndCommentDelimiter"/>
+        <module name="JavadocLeadingAsteriskAlign"/>
+        <module name="JavadocMethod">
+            <!--checks all, but doesn't require. If we have a doc, it should be valid-->
+            <property name="validateThrows" value="true"/>
+        </module>
+        <module name="JavadocMissingLeadingAsterisk"/>
+        <module name="JavadocMissingWhitespaceAfterAsterisk"/>
+        <module name="JavadocTagContinuationIndentation"/>
+        <module name="JavadocType"/> <!--checks all, but doesn't require. If we have a doc, it should be valid-->
+        <module name="NonEmptyAtclauseDescription"/>
+        <module name="RequireEmptyLineBeforeBlockTagGroup"/>
+        <module name="SummaryJavadoc"/> <!--checks all, but doesn't require. If we have a doc, it should be valid-->
+
+        <!--Metrics--> <!--N/A-->
+
+        <!--Miscellaneous-->
+        <module name="ArrayTypeStyle"/>
+        <module name="AvoidEscapedUnicodeCharacters"/>
+        <module name="CommentsIndentation"/>
+        <module name="HexLiteralCase"/>
+        <!-- Overlaps with the configured FinalLocalVariable, but is more strict  -->
+        <!--<module name="FinalParameters">
+            <property name="tokens" value="METHOD_DEF,CTOR_DEF,LITERAL_CATCH,FOR_EACH_CLAUSE,PATTERN_VARIABLE_DEF"/>
+        </module>-->
+
+        <module name="NoCodeInFile"/>
+        <module name="NumericalPrefixesInfixesSuffixesCharacterCase"/>
+        <module name="OuterTypeFilename"/>
+        <module name="UpperEll"/>
+
+        <!--Modifiers-->
+        <module name="ModifierOrder"/>
+        <module name="RedundantModifier"/>
+
+        <!--Naming Conventions-->
+        <module name="AbbreviationAsWordInName">
+            <property name="allowedAbbreviations" value="JSON,UUID"/>
+            <property name="ignoreFinal" value="false"/>
+        </module>
+        <module name="ClassTypeParameterName"/>
+        <module name="ConstantName"/>
+        <module name="IllegalIdentifierName"/>
+        <module name="InterfaceTypeParameterName"/>
+        <module name="LambdaParameterName"/>
+        <module name="LocalFinalVariableName"/>
+        <module name="LocalVariableName"/>
+        <module name="MemberName"/>
+        <module name="MethodName"/>
+        <module name="MethodTypeParameterName">
+            <property name="format" value="^[A-Z]+$"/>
+        </module>
+        <module name="PackageName">
+            <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
+        </module>
+        <module name="ParameterName"/>
+        <module name="PatternVariableName"/>
+        <module name="RecordComponentName"/>
+        <module name="RecordTypeParameterName"/>
+        <module name="StaticVariableName"/>
+        <module name="TypeName"/>
+
+        <!--Regexp--> <!--N/A-->
+        <!--Size Violations--> <!--N/A-->
+
+        <!--Whitespace-->
+        <module name="ArrayBracketNoWhitespace"/>
+        <module name="EmptyForInitializerPad"/>
+        <module name="EmptyForIteratorPad"/>
+        <module name="EmptyLineSeparator">
+            <property name="allowNoEmptyLineBetweenFields" value="true"/>
+            <property name="tokens" value="IMPORT,STATIC_IMPORT,CLASS_DEF,INTERFACE_DEF,ENUM_DEF,STATIC_INIT,INSTANCE_INIT,METHOD_DEF,CTOR_DEF,VARIABLE_DEF,RECORD_DEF,COMPACT_CTOR_DEF"/>
+        </module>
+        <module name="GenericWhitespace"/>
+        <module name="MethodParamPad"/>
+        <module name="NoLineWrap"/> <!--just imports and packages-->
+        <module name="NoWhitespaceAfter"/>
+        <module name="NoWhitespaceBefore"/>
+        <module name="NoWhitespaceBeforeCaseDefaultColon"/>
+        <module name="ParenPad"/>
+        <module name="SingleSpaceSeparator"/>
+        <module name="TypecastParenPad"/>
+        <module name="WhitespaceAfter"/>
+        <module name="WhitespaceAround"/>
+        <module name="WhitespaceBeforeEmptyBody"/>
+
+        <!--Custom-->
+        <module name="JavadocAlignParameterDescription"/>
+        <module name="JavadocParamTagOrder"/>
+        <module name="NullabilityAnnotations"/>
+        <module name="RedundantNullability"/>
+        <module name="UnnecessaryFullyQualifiedImport"/>
+    </module>
+</module>

.checkstyle/suppressions.xml

@@ -0,0 +1,7 @@
+<!DOCTYPE suppressions PUBLIC
+    "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+    "https://checkstyle.org/dtds/suppressions_1_2.dtd">
+<suppressions>
+    <suppress checks="MissingJavadoc.*" files="src[\\/]test[\\/]java[^\\/]*[\\/].*"/>
+    <suppress checks="JavadocPackage" files="src[\\/]test[\\/]java[^\\/]*[\\/].*"/>
+</suppressions>

.checkstyle/type_use_annotations.txt

@@ -0,0 +1,10 @@
+NonNull
+NotNull
+Nullable
+UnknownNullability
+Unmodifiable
+UnmodifiableView
+Range
+Positive
+NonNegative
+IntRange

.checkstyle/xpath-suppressions.xml

@@ -0,0 +1,17 @@
+<!DOCTYPE suppressions PUBLIC
+    "-//Checkstyle//DTD SuppressionXpathFilter Experimental Configuration 1.2//EN"
+    "https://checkstyle.org/dtds/suppressions_1_2_xpath_experimental.dtd">
+<suppressions>
+    <!--ignores all checks for @Deprecated(forRemoval=*) children-->
+    <suppress-xpath checks=".*" query="//*[MODIFIERS/ANNOTATION[(@text = 'Deprecated' or *[@text = 'Deprecated'] and ANNOTATION_MEMBER_VALUE_PAIR/IDENT[@text='forRemoval'])]]/descendant-or-self::node()"/>
+    <!--special case to ignore extra checks outside the root CLASS_DEF if the root CLASS_DEF is marked as deprecated for removal-->
+    <suppress-xpath checks=".*" query="/COMPILATION_UNIT[CLASS_DEF/MODIFIERS/ANNOTATION[IDENT[@text = 'Deprecated'] and ANNOTATION_MEMBER_VALUE_PAIR/IDENT[@text='forRemoval']]]/descendant-or-self::node()"/>
+    <!--ignores MissingJavadoc for ApiStatus.Internal children-->
+    <suppress-xpath checks="MissingJavadoc(Method|Type)" query="//*[MODIFIERS/ANNOTATION/DOT[@text = 'Internal' or *[@text = 'Internal']]]/descendant-or-self::node()"/>
+
+    <!--skip for private classes-->
+    <suppress-xpath checks="FinalClass" query="//CLASS_DEF[MODIFIERS/LITERAL_PRIVATE]"/>
+
+    <!--skip for classes inside of methods-->
+    <suppress-xpath checks="HideUtilityClassConstructor|MissingJavadoc(Method|Type)" query="//CLASS_DEF[ancestor::METHOD_DEF]"/>
+</suppressions>

.editorconfig

@@ -10,6 +10,7 @@ ij_any_block_comment_add_space = false
 ij_any_block_comment_at_first_column = false
 ij_any_line_comment_at_first_column = false
 ij_any_line_comment_add_space = true
+trim_trailing_whitespace = true
 
 [*.tiny]
 indent_style = tab
@@ -17,10 +18,10 @@ indent_style = tab
 [*.bat]
 end_of_line = crlf
 
-[*.yml]
+[{*.yaml,*.yml}]
 indent_size = 2
 
-[*.patch]
+[{*.patch,*.md}]
 trim_trailing_whitespace = false
 
 [*.java]
@@ -29,12 +30,26 @@ ij_java_class_count_to_use_import_on_demand = 999999
 ij_java_insert_inner_class_imports = false
 ij_java_names_count_to_use_import_on_demand = 999999
 ij_java_imports_layout = *, |, $*
+ij_java_layout_static_imports_separately = true
 ij_java_generate_final_locals = true
 ij_java_generate_final_parameters = true
 ij_java_method_parameters_new_line_after_left_paren = true
 ij_java_method_parameters_right_paren_on_new_line = true
 ij_java_use_fq_class_names = false
 ij_java_class_names_in_javadoc = 1
+# javadoc
+ij_java_doc_add_blank_line_after_description = true
+ij_java_doc_add_blank_line_after_param_comments = false
+ij_java_doc_add_blank_line_after_return = false
+ij_java_doc_add_p_tag_on_empty_lines = true
+ij_java_doc_align_exception_comments = true
+ij_java_doc_align_param_comments = true
+ij_java_doc_do_not_wrap_if_one_line = false
+ij_java_doc_enable_formatting = true
+ij_java_doc_enable_leading_asterisks = true
+ij_java_doc_indent_on_continuation = true
+ij_java_doc_param_description_on_new_line = false
+ij_java_doc_use_throws_not_exception_tag = true
 
 [paper-server/src/minecraft/java/**/*.java]
 ij_java_use_fq_class_names = true

.github/CODEOWNERS

@@ -1,2 +1,13 @@
-* @PaperMC/paper-maintainers
-/.github/CODEOWNERS @PaperMC/core-team
+# default ownership
+* @papermc/paper-maintainers
+
+# tooling
+/.github/workflows/ @papermc/tooling
+/gradle/ @papermc/tooling
+/paper-api/build.gradle.kts @papermc/tooling
+/paper-server/build.gradle.kts @papermc/tooling
+/build.gradle.kts @papermc/tooling
+/gradle.properties @papermc/tooling
+/settings.gradle.kts @papermc/tooling
+
+/.github/CODEOWNERS @papermc/leadership-team

.github/workflows/build.yaml

@@ -5,55 +5,63 @@
 # of the PR relating to this action.
 
 name: Build Paper
+
 on:
-  push:
   pull_request:
     types:
       - opened
       - reopened
       - synchronize
       - labeled
+  push:
+    branches-ignore:
+      - main
 
 jobs:
   build:
+    env:
+      ORG_GRADLE_PROJECT_paperBuildCacheEnabled: true
+      ORG_GRADLE_PROJECT_paperBuildCacheUsername: ${{ secrets.PAPER_BUILD_CACHE_USERNAME }}
+      ORG_GRADLE_PROJECT_paperBuildCachePassword: ${{ secrets.PAPER_BUILD_CACHE_PASSWORD }}
+      ORG_GRADLE_PROJECT_paperBuildCachePush: true
+
     # The goal of the build workflow is split into multiple requirements.
     # 1. Run on pushes to same repo.
     # 2. Run on PR open/reopen/syncs from repos that are not the same (PRs from the same repo are covered by 1)
-    # 3. Run on labeled PRs that have the build-pr-jar flag.
+    # 3. Run on labeled PRs that have the publish-pr flag.
     if: >
       (
         (github.event_name == 'push')
         || (github.event_name == 'pull_request' && github.repository != github.event.pull_request.head.repo.full_name && contains(fromJSON('["opened", "reopened", "synchronize"]'), github.event.action))
-        || (github.event_name == 'pull_request' && github.event.action == 'labeled' && github.event.label.name == 'build-pr-jar')
+        || (github.event_name == 'pull_request' && github.event.action == 'labeled' && github.event.label.name == 'publish-pr')
       )
 
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [21]
-      fail-fast: true
     steps:
       - if: ${{ github.event_name == 'push' }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
         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
+        uses: actions/checkout@v7
         with:
           ref: ${{ github.event.pull_request.head.sha }}
-      - name: JDK ${{ matrix.java }}
-        uses: actions/setup-java@v4
+      - name: JDK 25
+        uses: actions/setup-java@v5
         with:
-          java-version: ${{ matrix.java }}
+          java-version: 25
           distribution: 'zulu'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v6
+        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
+        uses: actions/github-script@v9
         id: determine
         env:
           REF_NAME: "${{ github.ref_name }}"
@@ -73,14 +81,14 @@ jobs:
 
             if (event_name === "push" && ref_type === "branch") {
               const {data: pulls} = await github.rest.pulls.list({ owner, repo, head: `${owner}:${ref_name}`, state: "open" });
-              const pull = pulls.find((pr) => !!pr.labels.find((l) => l.name === "build-pr-jar"));
+              const pull = pulls.find((pr) => !!pr.labels.find((l) => l.name === "publish-pr"));
               if (pull) {
                 result["pr"] = pull.number;
                 result["action"] = "paperclip";
                 core.notice(`This is a push action but to a branch with an open PR with the build paperclip label (${JSON.stringify(result)})`);
                 return result;
               }
-            } else if (event_name === "pull_request" && event.pull_request.labels.find((l) => l.name === "build-pr-jar")) {
+            } else if (event_name === "pull_request" && event.pull_request.labels.find((l) => l.name === "publish-pr")) {
               result["pr"] = event.pull_request.number;
               result["action"] = "paperclip";
               core.notice(`This is a pull request action with a build paperclip label (${JSON.stringify(result)})`);
@@ -100,30 +108,44 @@ jobs:
 
       - name: Upload Test Results
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
-          name: Test Results (${{ matrix.java }})
+          name: test-results
           path: |
             **/build/test-results/test/TEST-*.xml
 
+      - name: Publish Checkstyle Report
+        uses: Juuxel/publish-checkstyle-report@v3
+        if: failure() || success()
+        with:
+          reports: |
+            */build/reports/checkstyle/*.xml
+
       - name: Create Paperclip Jar
         if: fromJSON(steps.determine.outputs.result).action == 'paperclip'
-        run: ./gradlew createMojmapPaperclipJar --stacktrace
+        run: ./gradlew createPaperclipJar --stacktrace
 
       - name: Upload Paperclip Jar
         if: fromJSON(steps.determine.outputs.result).action == 'paperclip'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: paper-${{ fromJSON(steps.determine.outputs.result).pr }}
-          path: paper-server/build/libs/paper-paperclip-*-mojmap.jar
+          path: paper-server/build/libs/paper-paperclip-*.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
-    if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
+    needs: build
+    if: ${{ !cancelled() && needs.build.result != 'skipped' }}
     runs-on: ubuntu-latest
     steps:
       - name: Upload
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
-          name: Event File
+          name: event-data
           path: ${{ github.event_path }}

.github/workflows/close_invalid_prs.yml

@@ -2,7 +2,11 @@ name: Close invalid PRs
 
 on:
   pull_request_target:
-    types: [ opened ]
+    types:
+      - opened
+
+permissions:
+  pull-requests: write
 
 jobs:
   run:
@@ -12,7 +16,7 @@ jobs:
         github.head_ref == 'main' ||
         github.event.pull_request.head.repo.owner.type != 'User'
       )
-    runs-on: ubuntu-latest
+    runs-on: namespace-profile-linux-small
     steps:
       - uses: superbrothers/close-pull-request@v3
         id: "main_branch"

.github/workflows/issues-label-version.yaml

@@ -0,0 +1,185 @@
+on:
+  issues:
+    types:
+      - opened
+
+jobs:
+  detect-version:
+    runs-on: namespace-profile-linux-small
+    timeout-minutes: 5
+    permissions:
+      issues: read
+    outputs:
+      version: ${{ steps.detect.outputs.version }}
+    steps:
+      - id: detect
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        with:
+          script: |
+            // Capturing Groups:
+            // 1 = Brand
+            // 2 = Minecraft Version
+            // 3 = Build Number
+            // 4 = Git Branch/Commit
+            // 5 = Build Time
+            const NEW_PATTERN = /This server is running ([A-Za-z0-9]+) version ([\d\.]+)-(DEV|\d+)-(.*) \((.*)\) \(Implementing API version .*\)(?: \(Git: .*\))?/;
+
+            // Capturing Groups:
+            // 1 = Brand
+            // 2 = Minecraft Version
+            const OLD_PATTERN = /This server is running ([A-Za-z0-9]+) version .* \(MC: ([^\)]+)\) \(Implementing API version .*\)(?: \(Git: .*\))?/;
+
+            if (!context.payload.issue.body) {
+              core.info("Issue body is empty; unable to detect version.");
+              return;
+            }
+
+            let version;
+
+            const match = context.payload.issue.body.match(NEW_PATTERN);
+            if (match && match.length === 6) {
+              version = match[2];
+            } else {
+              const oldMatch = context.payload.issue.body.match(OLD_PATTERN);
+              if (oldMatch) {
+                version = oldMatch[2];
+              }
+            }
+
+            if (!version) {
+              core.info("Unable to determine the Minecraft version from the issue body.");
+              return;
+            }
+
+            core.info(`Detected Minecraft version: ${version}`);
+            core.setOutput('version', version);
+
+  label-version:
+    needs: detect-version
+    if: needs.detect-version.outputs.version != ''
+    runs-on: namespace-profile-linux-small
+    timeout-minutes: 5
+    permissions:
+      issues: write
+    steps:
+      - uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        with:
+          script: |
+            const version = '${{ needs.detect-version.outputs.version }}';
+
+            await github.rest.issues.addLabels({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.payload.issue.number,
+              labels: [`version: ${version}`],
+            });
+
+            core.info(`Added version label for ${version}.`);
+
+  check-support:
+    needs:
+      - detect-version
+      - label-version
+    if: needs.detect-version.outputs.version != ''
+    runs-on: namespace-profile-linux-small
+    timeout-minutes: 5
+    permissions:
+      issues: write
+    steps:
+      - uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        with:
+          script: |
+            const version = '${{ needs.detect-version.outputs.version }}';
+
+            const apiUrl = `https://fill.papermc.io/v3/projects/paper/versions/${encodeURIComponent(version)}`;
+            core.info(`Fetching version information from ${apiUrl}`);
+
+            let supportStatus;
+            let supportEnd;
+
+            try {
+              const response = await fetch(apiUrl, {
+                headers: {
+                  'Accept': 'application/json',
+                  'User-Agent': `GitHub Actions (${context.repo.owner}/${context.repo.repo})`,
+                },
+              });
+
+              if (response.status === 404) {
+                core.info(`Fill has no information for version ${version}.`);
+                return;
+              }
+
+              if (!response.ok) {
+                core.error(`Fill returned HTTP ${response.status}: ${response.statusText}`);
+                return;
+              }
+
+              const data = await response.json();
+              supportStatus = data?.version?.support?.status;
+              supportEnd = data?.version?.support?.end;
+            } catch (error) {
+              core.warning(`Failed to fetch support information: ${error}`);
+              return;
+            }
+
+            core.info(`Fill support status for ${version}: ${supportStatus}`);
+
+            // Only comment for deprecated or unsupported versions.
+            let comment;
+
+            if (supportStatus === 'UNSUPPORTED') {
+              comment =
+                `⚠️ **Minecraft ${version} is unsupported.**\n\n` +
+                `This version is no longer supported by PaperMC. ` +
+                (supportEnd
+                  ? `Support _ended_ on ${supportEnd}. `
+                  : '') +
+                `Please consider upgrading to a supported Minecraft version.`;
+            } else if (supportStatus === 'DEPRECATED') {
+              comment =
+                `⚠️ **Minecraft ${version} is deprecated.**\n\n` +
+                `This version is deprecated by PaperMC. ` +
+                (supportEnd
+                  ? `Support will end on ${supportEnd}. `
+                  : '') +
+                `Please consider upgrading to a supported Minecraft version.`;
+            } else {
+              core.info(`${version} is supported or has an unknown status.`);
+              return;
+            }
+
+            await github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.payload.issue.number,
+              body: comment,
+            });
+
+            if (supportStatus === 'UNSUPPORTED') {
+              try {
+                await github.rest.issues.removeLabel({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  issue_number: context.payload.issue.number,
+                  name: 'status: needs triage',
+                });
+              } catch (error) {
+                // ignore - missing label is not an error
+              }
+
+              await github.rest.issues.addLabels({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: context.payload.issue.number,
+                labels: ['resolution: unsupported'],
+              });
+
+              await github.rest.issues.update({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: context.payload.issue.number,
+                state: 'closed',
+                state_reason: 'not_planned',
+              });
+            }

.github/workflows/pr_comment.yml

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

.github/workflows/pr_review_signal.yml

@@ -0,0 +1,14 @@
+name: PR Review Signal
+
+on:
+  pull_request_review:
+    types:
+      - submitted
+
+permissions: {}
+
+jobs:
+  signal:
+    runs-on: namespace-profile-linux-small
+    steps:
+      - run: echo "A PR review was submitted"

.github/workflows/pr_review_status.yml

@@ -0,0 +1,69 @@
+name: Update PR Project Status
+
+on:
+  workflow_run:
+    workflows:
+      - PR Review Signal
+    types:
+      - completed
+
+  schedule:
+    - cron: "07 6 * * *"
+  workflow_dispatch:
+
+jobs:
+  review-submitted:
+    if: >
+      github.repository_owner == 'PaperMC' &&
+      github.event_name == 'workflow_run' &&
+      github.event.workflow_run.event == 'pull_request_review' &&
+      github.event.workflow_run.conclusion == 'success'
+
+    concurrency:
+      group: pr-review-status-${{ github.event.workflow_run.head_sha }}
+      cancel-in-progress: false
+    runs-on: namespace-profile-linux-small
+    steps:
+      - name: "authenticate"
+        id: "authenticate"
+        uses: actions/create-github-app-token@v3.2.0
+        with:
+          client-id: "${{ secrets.PROJECTS_CLIENT_ID }}"
+          private-key: "${{ secrets.PROJECTS_PRIVATE_KEY }}"
+          owner: "${{ github.repository_owner }}"
+
+      - name: Set status from approval
+        uses: PaperMC/update-projects-action/review-status@v0.4.1
+        with:
+          github-token: "${{ steps.authenticate.outputs.token }}"
+          mode: review
+          project-url: https://github.com/orgs/PaperMC/projects/2
+          maintainer-teams: paper-maintainers
+          developer-teams: paper-developers
+
+  promote-delayed-approvals:
+    if: >
+      github.repository_owner == 'PaperMC' &&
+      (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
+    concurrency:
+      group: pr-review-status-promote
+      cancel-in-progress: false
+    runs-on: namespace-profile-linux-small
+    steps:
+      - name: "authenticate"
+        id: "authenticate"
+        uses: actions/create-github-app-token@v3.2.0
+        with:
+          client-id: "${{ secrets.PROJECTS_CLIENT_ID }}"
+          private-key: "${{ secrets.PROJECTS_PRIVATE_KEY }}"
+          owner: "${{ github.repository_owner }}"
+
+      - name: Promote delayed approvals
+        uses: PaperMC/update-projects-action/review-status@v0.4.1
+        with:
+          github-token: "${{ steps.authenticate.outputs.token }}"
+          mode: promote
+          project-url: https://github.com/orgs/PaperMC/projects/2
+          maintainer-teams: paper-maintainers
+          developer-teams: paper-developers
+          promote-after-days: "14"

.github/workflows/projects.yml

@@ -14,18 +14,17 @@ jobs:
     concurrency:
       group: update-bugs-project-${{ github.event.issue.number }}
       cancel-in-progress: true
-    runs-on: ubuntu-latest
+    runs-on: namespace-profile-linux-small
     steps:
       - name: "authenticate"
         id: "authenticate"
-        uses: "tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a" # v2.1.0
+        uses: actions/create-github-app-token@v3.2.0
         with:
-          installation_retrieval_mode: id
-          installation_retrieval_payload: "36153445"
-          app_id: "${{ secrets.PROJECTS_APP_ID }}"
-          private_key: "${{ secrets.PROJECTS_PRIVATE_KEY }}"
+          app-id: "${{ secrets.PROJECTS_APP_ID }}"
+          private-key: "${{ secrets.PROJECTS_PRIVATE_KEY }}"
+          owner: "${{ github.repository_owner }}"
 
-      - uses: PaperMC/update-projects-action@v0.2.0
+      - uses: PaperMC/update-projects-action@v0.3.0
         name: Update open issue
         if: github.event.issue.state == 'open'
         with:
@@ -53,7 +52,7 @@ jobs:
               "status: unlikely": "✅ Accepted"
             }
 
-      - uses: PaperMC/update-projects-action@v0.2.0
+      - uses: PaperMC/update-projects-action@v0.3.0
         name: Update closed issue
         if: github.event.issue.state == 'closed'
         with:

.github/workflows/publish_pr.yml

@@ -0,0 +1,37 @@
+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: namespace-profile-linux-small
+    steps:
+      - name: Generate an Application repository access token
+        id: gen_repo_token
+        uses: actions/create-github-app-token@v3.2.0
+        with:
+          client-id: ${{ secrets.PR_PUBLISHING_GH_APP_CLIENT_ID }}
+          private-key: ${{ secrets.PR_PUBLISHING_GH_APP_KEY }}
+          repositories: ${{ github.repository }}
+      - name: Publish PR
+        uses: PaperMC/action-pr-publishing@v1.1.1
+        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
+          artifacts-size-limit: 100
+          base-maven-url: 'https://maven-prs.papermc.io'
+          self-name: 'papermc-pr-publishing[bot]'

.github/workflows/release-26.3.yaml

@@ -0,0 +1,56 @@
+name: Release 26.3
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+
+permissions:
+  contents: read
+
+concurrency:
+  cancel-in-progress: false
+  group: release-26.3
+
+jobs:
+  release:
+    # guard for manual dispatch
+    if: ${{ github.ref == 'refs/heads/main' }}
+    runs-on: namespace-profile-linux-default
+    timeout-minutes: 30
+    #env:
+    #  BUILD_NUMBER: ${{ github.run_number }}
+    steps:
+      - name: "environment"
+        run: |
+          echo "BUILD_NUMBER=$((129 + GITHUB_RUN_NUMBER))" >> "$GITHUB_ENV"
+          echo "BUILD_STARTED_AT=$(date -u +%Y-%m-%dT%H:%M:%SZ)" >> "$GITHUB_ENV"
+
+      - name: "git / checkout"
+        uses: namespacelabs/nscloud-checkout-action@66f2dc6f6c42a8ac6c4e53473c4840006822831e # v9.0.1
+        with:
+          fetch-depth: 0
+
+      - uses: papermc/ci/setup-gradle@main
+
+      - uses: papermc/ci/build-paper@main
+
+      - if: ${{ !cancelled() }}
+        uses: papermc/ci/upload-event-data@main
+        with:
+          path: ${{ github.event_path }}
+
+      - if: ${{ !cancelled() }}
+        uses: papermc/ci/upload-test-results@main
+
+      - uses: papermc/ci/publish-fill@main
+        with:
+          fill_api_url: ${{ secrets.FILL_API_URL }}
+          fill_api_key: ${{ secrets.FILL_API_KEY }}
+
+      - uses: papermc/ci/publish-maven@main
+        with:
+          maven_username: ${{ secrets.ARTIFACTORY_USERNAME }}
+          maven_password: ${{ secrets.ARTIFACTORY_PASSWORD }}
+          maven_tasks: -PpublishDevBundle :paper-api:publish publishDevBundlePublicationToPaperReleasesRepository

.github/workflows/test_results.yaml

@@ -0,0 +1,24 @@
+name: Test Results
+
+on:
+  workflow_run:
+    workflows: [ "Build Paper" ]
+    types:
+      - completed
+
+permissions:
+  actions: read
+  checks: write
+
+jobs:
+  test-results:
+    name: Test Results
+    if: github.event.workflow_run.conclusion != 'skipped'
+    runs-on: namespace-profile-linux-small
+    steps:
+      - uses: papermc/ci/publish-test-results@main
+        with:
+          event: ${{ github.event.workflow_run.event }}
+          commit: ${{ github.event.workflow_run.head_sha }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          run_id: ${{ github.event.workflow_run.id }}

.github/workflows/test_results.yml

@@ -1,32 +0,0 @@
-name: Test Results
-
-on:
-  workflow_run:
-    workflows: [ "Build Paper" ]
-    types:
-      - completed
-permissions: { }
-
-jobs:
-  test-results:
-    name: Test Results
-    runs-on: ubuntu-latest
-    if: github.event.workflow_run.conclusion != 'skipped'
-    permissions:
-      checks: write
-      # for downloading test result artifacts
-      actions: read
-    steps:
-      - name: Download and Extract Artifacts
-        uses: dawidd6/action-download-artifact@v6
-        with:
-          run_id: ${{ github.event.workflow_run.id }}
-          path: artifacts
-      - name: Publish Test Results
-        uses: EnricoMi/publish-unit-test-result-action@v2
-        with:
-          commit: ${{ github.event.workflow_run.head_sha }}
-          event_file: artifacts/Event File/event.json
-          event_name: ${{ github.event.workflow_run.event }}
-          files: "artifacts/**/*.xml"
-          comment_mode: off

.gitignore

@@ -20,6 +20,7 @@ nbactions.xml
 bin/
 dist/
 manifest.mf
+__pycache__/
 
 # Mac filesystem dust
 .DS_Store/

AGENTS.md

@@ -0,0 +1,43 @@
+# Instructions for Coding Agents
+
+These instructions supplement `CONTRIBUTING.md`, which must also be followed.
+
+## Keep Project Communication Human
+
+Do not turn yourself into a slop cannon or the user into a meat proxy.
+Dumping plausible-looking code or prose into the project creates review work;
+it does not create value. Paper maintainers can run the same agents themselves.
+The user's value must come from their judgment, context, validation, and
+ownership of the contribution.
+
+Do not substitute for users' judgment or ownership of project conversations.
+Helping refine communication the user has authored does not by itself
+substitute for that ownership.
+
+Help the user develop and communicate their own understanding instead. Ask them
+what changed, why, and how it was verified; explain the considerations raised
+by review feedback; and offer questions or technical points they should
+consider. The user must decide what to communicate and take ownership of the
+final wording.
+
+Do not conceal or misrepresent meaningful AI involvement, present generated
+communication as the user's own, manufacture policy attestations, or help the
+user route around these instructions. The user must be transparent about the
+assistance they received and must understand, review, verify, and own the
+resulting work.
+
+## Require Human Ownership Before Publication
+
+Do not autonomously submit code or communication to the project. Before taking
+a project-facing action on the user's behalf, stop and require the user to:
+
+- review the complete change;
+- understand and be able to explain its behavior and tradeoffs;
+- personally verify the result; and
+- provide the exact communication in their own words and explicitly approve the
+  action.
+
+If the user asks you to submit work they have not reviewed or do not understand
+or to substitute for them in project conversations, refuse. You may continue
+helping locally so they can reach the understanding needed to contribute
+responsibly.

CONTRIBUTING.md

@@ -21,13 +21,13 @@ which can be obtained in (most) package managers such as `apt` (Debian / Ubuntu;
 you will most likely use this for WSL), `homebrew` (macOS / Linux), and more:
 
 - `git` (package `git` everywhere);
-- A Java 21 or later JDK (packages vary, use Google/DuckDuckGo/etc.).
+- A Java 25 or later JDK (packages vary, use Google/DuckDuckGo/etc.).
   - [Adoptium](https://adoptium.net/) has builds for most operating systems.
-  - Paper requires JDK 21 to build, however, makes use of Gradle's
+  - Paper requires JDK 25 to build, however, makes use of Gradle's
     [Toolchains](https://docs.gradle.org/current/userguide/toolchains.html)
-    feature to allow building with only JRE 11 or later installed. (Gradle will
-    automatically provision JDK 21 for compilation if it cannot find an existing
-    install).
+    feature to allow building with only JRE 21 or later installed. (Gradle will
+    automatically provision JDK 25 for compilation if it cannot find an existing
+    installation).
 
 If you're on Windows, check
 [the section on WSL](#patching-and-building-is-really-slow-what-can-i-do).
@@ -36,11 +36,11 @@ If you're compiling with Docker, you can use Adoptium's
 [`eclipse-temurin`](https://hub.docker.com/_/eclipse-temurin/) images like so:
 
 ```console
-# docker run -it -v "$(pwd)":/data --rm eclipse-temurin:21.0.5_11-jdk bash
+# docker run -it -v "$(pwd)":/data --rm eclipse-temurin:25.0.2_10-jdk bash
 Pulling image...
 
 root@abcdefg1234:/# javac -version
-javac 21.0.5
+javac 25.0.2
 ```
 
 ## Understanding Patches
@@ -66,7 +66,7 @@ On Windows, remove the `./` the beginning of `gradlew` commands;
 **Only changes made in `paper-server/src/minecraft` have to deal with the patch system.**
 
 `paper-server/src/minecraft` is not a git repositories in the traditional sense. Its
-initial commits are the decompiled and deobfuscated Minecraft source files. The per-file
+initial commits are the decompiled Minecraft source files. The per-file
 patches are applied on top of these files as a single, large commit, which is then followed
 by the individual feature-patch commits.
 
@@ -184,14 +184,60 @@ These steps assume the `origin` remote is your fork of this repository and `upst
 ## PR Policy
 
 We'll accept changes that make sense. You should be able to justify their
-existence, along with any maintenance costs that come with them. Using
-[obfuscation helpers](#obfuscation-helpers) aids in the maintenance costs.
+existence, along with any maintenance costs that come with them.
 Remember that these changes will affect everyone who runs Paper, not just you
 and your server.
 
 While we will fix minor formatting issues, you should stick to the guide below
 when making and submitting changes.
 
+### Contribution Ownership and AI Assistance
+
+Tools that generate code or text can be useful while working on a contribution,
+but they are not a substitute for the contributor. You are responsible for every
+part of what you submit. Only submit changes that you understand, have personally
+reviewed, and have verified to the best of your ability. You should be able to
+explain why the change is needed, how it works, and what tradeoffs it makes.
+
+Project communication, including issues, discussion posts, pull request
+descriptions, comments, and review responses, should be written by you in your
+own words. Do not use an AI tool as a proxy for the conversation. Validate any
+tool output you rely on, then communicate the relevant conclusions yourself.
+
+Do not conceal or misrepresent meaningful AI involvement. Be transparent about
+how these tools contributed to your work; that transparency does not replace
+your responsibility for the contribution.
+
+Review is a collaborative process, not a way to outsource completion of a
+generated change to maintainers. Be prepared to answer questions about your
+reasoning and to remain involved until the contribution is complete. We may
+close contributions when the author cannot explain or take responsibility for
+the submitted work.
+
+### Branches and Minecraft Versions
+
+Generally, PRs should be targeted at the `main` branch, where active development for
+the latest Minecraft release happens.
+
+If a new Minecraft release is imminent, it may be wise to wait until it's released
+and merged to `main` to avoid having to rebase your PR, as the `main` branch will be
+frozen during this time (you can ask in the Paper Discord if you're unsure).
+
+For old Minecraft versions - we are unlikely to accept PRs targeting any versions not
+marked as supported at https://fill-ui.papermc.io/projects/paper.
+
+For snapshots and other pre-release versions - you should only target these branches
+for changes specific to features or changes in those versions. For example, if Copper
+Golem is going to be added in 1.21.9, you can PR to the relevant dev branch as it would
+not make sense to merge that into `main`. Or, if you are fixing a bug that only exists in
+a dev branch, you should target that branch. When submitting PRs to dev branches, please
+coordinate with the dev team in Discord or open an issue before starting work to ensure
+it's an area we want to accept changes for. The team prefers to handle initial updating
+work through to the server running ourselves, so do not attempt to PR version updates
+(i.e. 25w42a -> 25w43a, etc.) or while there are still unapplied source patches. Feature
+patches are also not applied until at earliest the pre-release phase to avoid unnecessary
+churn.
+
 ## Formatting
 
 All modifications to Vanilla files should be marked. For historical reasons,
@@ -257,7 +303,7 @@ public class SomeVanillaClass {
 
 We are in the process of switching nullability annotation libraries, so you might need to use one or the other:
 
-**For classes we add**: Fields, method parameters and return types that are nullable should be marked via the
+**For classes, we add or modifications to Vanilla Files**: Fields, method parameters and return types that are nullable should be marked via the
 `@Nullable` annotation from `org.jspecify.annotations`. Whenever you create a new class, add `@NullMarked`, meaning types
 are assumed to be non-null by default. For less obvious placing such as on generics or arrays, see the [JSpecify docs](https://jspecify.dev/docs/user-guide/).
 
@@ -358,26 +404,6 @@ index a92bf8967..d0ab87d0f 100644
 ```
 -->
 
-## Obfuscation Helpers
-
-While rarely needed, obfuscation helpers are sometimes useful when it comes
-to unmapped local variables, or poorly named method parameters. In an effort
-to make future updates easier on ourselves, Paper tries to use obfuscation
-helpers wherever it makes sense. The purpose of these helpers is to make the
-code more readable and maintainable. These helpers should be made easy to
-inline by the JVM wherever possible.
-
-An example of an obfuscation helper for a local variable:
-```java
-double d0 = entity.getX(); final double fromX = d0; // Paper - OBFHELPER
-// ...   
-this.someMethod(fromX); // Paper
-```
-
-While they may not always be done in exactly the same way, the general goal is
-always to improve readability and maintainability. Use your best judgment and do
-what fits best in your situation.
-
 ## Configuration files
 
 To use a configurable value in your patch, add a new field in either the
@@ -417,13 +443,19 @@ int maxPlayers = GlobalConfiguration.get().misc.maxNumOfPlayers;
 Generally for global config values you will use the fully qualified class name,
 `io.papermc.paper.configuration.GlobalConfiguration` since it's not imported in
 most places.
----
+
 If you are adding a new world config value, you must have access to an instance
 of the `net.minecraft.world.level.Level` which you can then access the config by doing
 ```java
 int maxPlayers = level.paperConfig().misc.maxNumOfPlayers;
 ```
 
+#### Documentation
+When adding or removing a config option, you should open a pull request in our [documentation repository](https://github.com/PaperMC/docs)
+to keep it in sync and accurate. If you're unsure whether your original change will be accepted, then it's fine to wait with making the documentation
+pull request until a maintainer has reviewed your changes. Once everything is done, the documentation pull request will be merged at the same time
+that your original pull request is.
+
 ## Testing API changes
 
 ### Using the Paper Test Plugin
@@ -452,14 +484,28 @@ If you use Maven to build your plugin:
   If you use Windows and don't usually build using WSL, you might not need to
   do this.
 
+## Tips and Tricks
+
+### IntelliJ IDEA
+
+- Under `Settings > Appearance & Behavior > System Settings`, disable
+  `Sync external changes: Periodically when the IDE is inactive (experimental)`.
+  When disabled, the IDE will not attempt to reindex files while patches are applying
+  unless you interact with the IDE during the process. This avoids severe slowdowns and freezes.
+- Under `Settings > Appearance & Behavior > System Settings`, you may also want to
+  disable `Reopen projects on startup` to avoid freeze loops.
+
 ## Frequently Asked Questions
 
 ### My commit doesn't need a build, what do I do?
 
-Quite simple: You add `[ci skip]` to the start of your commit subject.
+Quite simple: You add `[ci skip]` to the start of your pull request title.
 
 This case most often applies to changes to files like `README.md`, this very
-file (`CONTRIBUTING.md`), the `LICENSE.md` file, and so forth.
+file (`CONTRIBUTING.md`), the `LICENSE.md` file, and also small updates to Javadocs or other documentation.
+
+Do *not* add [ci skip] to the start of your individual commit subjects, as your
+pull request will not be mergeable until a new commit is added due to status check requirements.
 
 ### Patching and building is *really* slow, what can I do?
 
@@ -469,11 +515,11 @@ release, either update to Windows 10/11 or move to macOS/Linux/BSD.
 In order to speed up patching process on Windows, it's recommended you get WSL 2.
 This is available in Windows 10 v2004, build 19041 or higher. (You can check
 your version by running `winver` in the run window (Windows key + R)). If you're
-using an out of date version of Windows 10, update your system with the
+using an out-of-date version of Windows 10, update your system with the
 [Windows 10 Update Assistant](https://www.microsoft.com/en-us/software-download/windows10) or [Windows 11 Update Assistant](https://www.microsoft.com/en-us/software-download/windows11).
 
 To set up WSL 2, follow the information here:
-<https://docs.microsoft.com/en-us/windows/wsl/install>
+<https://learn.microsoft.com/en-us/windows/wsl/install>
 
 You will most likely want to use the Ubuntu apps. Once it's set up, install the
 required tools with `sudo apt-get update && sudo apt-get install $TOOL_NAMES
@@ -482,5 +528,5 @@ required tools with `sudo apt-get update && sudo apt-get install $TOOL_NAMES
 everything like usual.
 
 > ❗ Do not use the `/mnt/` directory in WSL! Instead, mount the WSL directories
-> in Windows like described here:
-> <https://docs.microsoft.com/en-us/windows/wsl/filesystems#view-your-current-directory-in-windows-file-explorer>
+> in Windows as described here:
+> <https://learn.microsoft.com/en-us/windows/wsl/filesystems#view-your-current-directory-in-windows-file-explorer>

LICENSE.md

@@ -65,4 +65,7 @@ aerulion <aerulion@gmail.com>
 Lukas Planz <lukas.planz@web.de>
 granny <contact@granny.dev>
 mja00 <me@mja00.dev>
+roro1506HD <16260475+roro1506HD@users.noreply.github.com>
+Toffikk <slodkitofik@gmail.com>
+NonSwag <mail@nonswag.dev>
 ```

README.md

@@ -1,4 +1,6 @@
-Paper [![Paper Build Status](https://img.shields.io/github/actions/workflow/status/PaperMC/Paper/build.yml?branch=main)](https://github.com/PaperMC/Paper/actions)
+Paper [![Version](https://img.shields.io/maven-metadata/v?metadataUrl=https%3A%2F%2Fartifactory.papermc.io%2Fartifactory%2Funiverse%2Fio%2Fpapermc%2Fpaper%2Fpaper-api%2Fmaven-metadata.xml&strategy=highestVersion&filter=26.3.*&label=version&color=%23344ceb
+)](https://papermc.io/downloads/paper)
+[![Paper Build Status](https://img.shields.io/github/actions/workflow/status/PaperMC/Paper/release-26.3.yaml?branch=main)](https://github.com/PaperMC/Paper/actions)
 [![Discord](https://img.shields.io/discord/289587909051416579.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/papermc)
 [![GitHub Sponsors](https://img.shields.io/github/sponsors/papermc?label=GitHub%20Sponsors)](https://github.com/sponsors/PaperMC)
 [![Open Collective](https://img.shields.io/opencollective/all/papermc?label=OpenCollective%20Sponsors)](https://opencollective.com/papermc)
@@ -16,7 +18,7 @@ Paperclip is a jar file that you can download and run just like a normal jar fil
 
 Download Paper from our [downloads page](https://papermc.io/downloads/paper).
 
-Run the Paperclip jar directly from your server. Just like old times
+Run the Paperclip jar directly from your server. Just like old times.
 
 * Documentation on using Paper: [docs.papermc.io](https://docs.papermc.io)
 * For a sneak peek at upcoming features, [see here](https://github.com/PaperMC/Paper/projects)
@@ -27,6 +29,23 @@ How To (Plugin Developers)
 * See upcoming, pending, and recently added API [here](https://github.com/orgs/PaperMC/projects/2/views/4)
 * Paper API javadocs here: [papermc.io/javadocs](https://papermc.io/javadocs/)
 #### Repository (for paper-api)
+See [the docs](https://docs.papermc.io/paper/dev/project-setup/#adding-paper-as-a-dependency) for more details.
+##### Gradle
+```kotlin
+repositories {
+    maven {
+        url = uri("https://repo.papermc.io/repository/maven-public/")
+    }
+}
+
+dependencies {
+    compileOnly("io.papermc.paper:paper-api:26.3.build.+")
+}
+
+java {
+    toolchain.languageVersion.set(JavaLanguageVersion.of(25))
+}
+```
 ##### Maven
 
 ```xml
@@ -40,32 +59,16 @@ How To (Plugin Developers)
 <dependency>
     <groupId>io.papermc.paper</groupId>
     <artifactId>paper-api</artifactId>
-    <version>1.21.5-R0.1-SNAPSHOT</version>
+    <version>[26.3.build,)</version>
     <scope>provided</scope>
 </dependency>
 ```
-##### Gradle
-```kotlin
-repositories {
-    maven {
-        url = uri("https://repo.papermc.io/repository/maven-public/")
-    }
-}
-
-dependencies {
-    compileOnly("io.papermc.paper:paper-api:1.21.5-R0.1-SNAPSHOT")
-}
-
-java {
-    toolchain.languageVersion.set(JavaLanguageVersion.of(21))
-}
-```
 
 How To (Compiling Jar From Source)
 ------
-To compile Paper, you need JDK 21 and an internet connection.
+To compile Paper, you need JDK 25 and an internet connection.
 
-Clone this repo, run `./gradlew applyPatches`, then `./gradlew createMojmapBundlerJar` from your terminal. You can find the compiled jar in the `paper-server/build/libs` directory.
+Clone this repo, run `./gradlew applyPatches`, then `./gradlew createPaperclipJar` from your terminal. You can find the compiled jar in the `paper-server/build/libs` directory.
 
 To get a full list of tasks, run `./gradlew tasks`.
 
@@ -88,13 +91,11 @@ You can find our collective [here](https://opencollective.com/papermc), or you c
 Special Thanks To:
 -------------
 
+[![CI powered by namespace badge](https://assets.papermc.io/sponsors/namespace-oss-badge.svg)](https://namespace.so/github-actions/?utm_source=oss&utm_campaign=papermc)
+
 [![YourKit-Logo](https://www.yourkit.com/images/yklogo.png)](https://www.yourkit.com/)
 
 [YourKit](https://www.yourkit.com/), makers of the outstanding java profiler, support open source projects of all kinds with their full featured [Java](https://www.yourkit.com/java/profiler) and [.NET](https://www.yourkit.com/.net/profiler) application profilers. We thank them for granting Paper an OSS license so that we can make our software the best it can be.
 
-[<img src="https://user-images.githubusercontent.com/21148213/121807008-8ffc6700-cc52-11eb-96a7-2f6f260f8fda.png" alt="" width="150">](https://www.jetbrains.com)
-
-[JetBrains](https://www.jetbrains.com/), creators of the IntelliJ IDEA, supports Paper with one of their [Open Source Licenses](https://www.jetbrains.com/opensource/). IntelliJ IDEA is the recommended IDE for working with Paper, and most of the Paper team uses it.
-
 All our sponsors!  
 [![Sponsor Image](https://raw.githubusercontent.com/PaperMC/papermc.io/data/sponsors.png)](https://papermc.io/sponsors)

build-data/dev-imports.txt

@@ -5,10 +5,3 @@
 #     authlib com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
 #     datafixerupper com.mojang.datafixers.DataFixerBuilder
 #     datafixerupper com/mojang/datafixers/util/Either.java
-# To import classes from the vanilla Minecraft jar use `minecraft` as the artifactId:
-#     minecraft net.minecraft.world.level.entity.LevelEntityGetterAdapter
-#     minecraft net/minecraft/world/level/entity/LevelEntityGetter.java
-# To import minecraft data files, like the default chat type, use `mc_data` as the prefix:
-#     mc_data chat_type/chat.json
-#     mc_data dimension_type/overworld.json
-#

build-data/paper.at

@@ -5,65 +5,45 @@ private-f net.minecraft.server.MinecraftServer connection
 private-f net.minecraft.server.MinecraftServer levels
 private-f net.minecraft.world.item.ItemStack components
 private-f net.minecraft.world.item.ItemStack item
+private-f net.minecraft.world.item.crafting.RecipeManager learnableRecipes
 private-f net.minecraft.world.level.block.entity.BeehiveBlockEntity stored
 protected net.minecraft.world.entity.LivingEntity skipDropExperience
+protected net.minecraft.world.level.Level thread
 protected-f net.minecraft.server.MinecraftServer worldData
 public net.minecraft.ChatFormatting code
-public net.minecraft.Util onThreadException(Ljava/lang/Thread;Ljava/lang/Throwable;)V
 public net.minecraft.advancements.Advancement decorateName(Lnet/minecraft/advancements/DisplayInfo;)Lnet/minecraft/network/chat/Component;
 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.core.component.DataComponentPatch map
+public net.minecraft.core.component.Removed
 public net.minecraft.nbt.ListTag <init>(Ljava/util/List;)V
 public net.minecraft.nbt.ListTag identifyRawElementType()B
 public net.minecraft.network.Connection address
 public net.minecraft.network.Connection channel
-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
-public net.minecraft.network.chat.numbers.StyledFormat style
+public net.minecraft.network.chat.contents.TranslatableContents PRIMITIVE_ARG_CODEC
 public net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket <init>(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/entity/BlockEntityType;Lnet/minecraft/nbt/CompoundTag;)V
-public net.minecraft.network.protocol.game.ClientboundBlockUpdatePacket blockState
-public net.minecraft.network.protocol.game.ClientboundSetDefaultSpawnPositionPacket pos
-public net.minecraft.network.protocol.game.ServerboundMovePlayerPacket hasPos
-public net.minecraft.network.protocol.game.ServerboundMovePlayerPacket hasRot
-public net.minecraft.network.protocol.game.ServerboundMovePlayerPacket x
-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 <init>(Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/resources/RegistryOps$RegistryInfoLookup;)V
 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
-public net.minecraft.server.MinecraftServer fixerUpper
-public net.minecraft.server.MinecraftServer playerDataStorage
-public net.minecraft.server.MinecraftServer prepareLevels(Lnet/minecraft/server/level/progress/ChunkProgressListener;)V
-public net.minecraft.server.MinecraftServer progressListenerFactory
-public net.minecraft.server.MinecraftServer resources
-public net.minecraft.server.MinecraftServer serverThread
-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.DedicatedServerProperties$WorldDimensionData <init>(Lcom/google/gson/JsonObject;Ljava/lang/String;)V
 public net.minecraft.server.dedicated.Settings getStringRaw(Ljava/lang/String;)Ljava/lang/String;
 public net.minecraft.server.dedicated.Settings properties
 public net.minecraft.server.level.ChunkHolder oldTicketLevel
 public net.minecraft.server.level.ChunkHolder playerProvider
+public net.minecraft.server.level.ChunkLevel BLOCK_TICKING_LEVEL
 public net.minecraft.server.level.ChunkLevel ENTITY_TICKING_LEVEL
-public net.minecraft.server.level.ChunkMap addEntity(Lnet/minecraft/world/entity/Entity;)V
-public net.minecraft.server.level.ChunkMap anyPlayerCloseEnoughForSpawning(Lnet/minecraft/world/level/ChunkPos;)Z
-public net.minecraft.server.level.ChunkMap distanceManager
+public net.minecraft.server.level.ChunkLevel FULL_CHUNK_LEVEL
 public net.minecraft.server.level.ChunkMap entityMap
 public net.minecraft.server.level.ChunkMap getVisibleChunkIfPresent(J)Lnet/minecraft/server/level/ChunkHolder;
 public net.minecraft.server.level.ChunkMap level
-public net.minecraft.server.level.ChunkMap progressListener
 public net.minecraft.server.level.ChunkMap save(Lnet/minecraft/world/level/chunk/ChunkAccess;)Z
 public net.minecraft.server.level.ChunkMap serverViewDistance
 public net.minecraft.server.level.ChunkMap setServerViewDistance(I)V
@@ -77,76 +57,76 @@ 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.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
-public net.minecraft.server.level.ServerLevel chunkSource
 public net.minecraft.server.level.ServerLevel entityManager
 public net.minecraft.server.level.ServerLevel findLightningRod(Lnet/minecraft/core/BlockPos;)Ljava/util/Optional;
-public net.minecraft.server.level.ServerLevel getEntities()Lnet/minecraft/world/level/entity/LevelEntityGetter;
 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 initMenu(Lnet/minecraft/world/inventory/AbstractContainerMenu;)V
-public net.minecraft.server.level.ServerPlayer isChangingDimension
 public net.minecraft.server.level.ServerPlayer language
 public net.minecraft.server.level.ServerPlayer lastSentExp
 public net.minecraft.server.level.ServerPlayer nextContainerCounter()V
 public net.minecraft.server.level.ServerPlayer particleStatus
 public net.minecraft.server.level.ServerPlayer seenCredits
+public net.minecraft.server.level.ServerPlayer setShoulderEntityLeft(Lnet/minecraft/nbt/CompoundTag;)V
+public net.minecraft.server.level.ServerPlayer setShoulderEntityRight(Lnet/minecraft/nbt/CompoundTag;)V
 public net.minecraft.server.level.ServerPlayer triggerDimensionChangeTriggers(Lnet/minecraft/server/level/ServerLevel;)V
 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.ServerPlayer$RespawnPosAngle <init>(Lnet/minecraft/world/phys/Vec3;FF)V
+public net.minecraft.server.level.ServerPlayerGameMode hasDelayedDestroy
+public net.minecraft.server.network.ServerCommandSuggestionsProvider limitSuggestionCount(Lcom/mojang/brigadier/suggestion/Suggestions;)Lcom/mojang/brigadier/suggestion/Suggestions;
+public net.minecraft.server.network.ServerConfigurationPacketListenerImpl clientInformation
+public net.minecraft.server.network.ServerConfigurationPacketListenerImpl currentTask
+public net.minecraft.server.network.ServerConfigurationPacketListenerImpl finishCurrentTask(Lnet/minecraft/server/network/ConfigurationTask$Type;)V
 public net.minecraft.server.network.ServerGamePacketListenerImpl isChatMessageIllegal(Ljava/lang/String;)Z
+public net.minecraft.server.network.ServerGamePacketListenerImpl restartClientLoadTimerAfterRespawn()V
 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.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.Util onThreadException(Ljava/lang/Thread;Ljava/lang/Throwable;)V
 public net.minecraft.util.datafix.fixes.BlockStateData register(ILcom/mojang/serialization/Dynamic;[Lcom/mojang/serialization/Dynamic;)V
 public net.minecraft.util.datafix.fixes.ItemIdFix ITEM_NAMES
 public net.minecraft.util.datafix.fixes.ItemSpawnEggFix ID_TO_ENTITY
+public net.minecraft.util.filefix.FileFixerUpper FILE_FIXER_INTRODUCTION_VERSION
 public net.minecraft.world.BossEvent color
 public net.minecraft.world.BossEvent name
 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 lastDamageTime
 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.MobEffect$AttributeTemplate <init>(Lnet/minecraft/resources/Identifier;DLnet/minecraft/world/entity/ai/attributes/AttributeModifier$Operation;)V
 public net.minecraft.world.effect.MobEffectInstance hiddenEffect
-public net.minecraft.world.entity.AreaEffectCloud durationOnUse
-public net.minecraft.world.entity.AreaEffectCloud ownerUUID
-public net.minecraft.world.entity.AreaEffectCloud potionContents
-public net.minecraft.world.entity.AreaEffectCloud radiusOnUse
-public net.minecraft.world.entity.AreaEffectCloud radiusPerTick
+public net.minecraft.world.effect.MobEffectInstance isShorterDurationThan(Lnet/minecraft/world/effect/MobEffectInstance;)Z
+public net.minecraft.world.entity.AgeableMob setAgeLocked(Z)V
+public net.minecraft.world.entity.AreaEffectCloud owner
 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.Avatar DATA_PLAYER_MODE_CUSTOMISATION
+public net.minecraft.world.entity.ConversionTracker afflictionTime
+public net.minecraft.world.entity.ConversionTracker conversionTime
+public net.minecraft.world.entity.ConversionTracker setConverting(Z)V
 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;
 public net.minecraft.world.entity.Display getBillboardConstraints()Lnet/minecraft/world/entity/Display$BillboardConstraints;
@@ -186,30 +166,26 @@ public net.minecraft.world.entity.Display$TextDisplay getTextOpacity()B
 public net.minecraft.world.entity.Display$TextDisplay setFlags(B)V
 public net.minecraft.world.entity.Display$TextDisplay setText(Lnet/minecraft/network/chat/Component;)V
 public net.minecraft.world.entity.Display$TextDisplay setTextOpacity(B)V
+public net.minecraft.world.entity.Entity DATA_TICKS_FROZEN
 public net.minecraft.world.entity.Entity FLAG_INVISIBLE
+public net.minecraft.world.entity.Entity getAirDrag()F
+public net.minecraft.world.entity.Entity getDefaultGravity()D
 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 isInRain()Z
 public net.minecraft.world.entity.Entity isInvulnerableToBase(Lnet/minecraft/world/damagesource/DamageSource;)Z
 public net.minecraft.world.entity.Entity onGround
 public net.minecraft.world.entity.Entity passengers
-public net.minecraft.world.entity.Entity portalCooldown
-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.GlowSquid setDarkTicks(I)V
 public net.minecraft.world.entity.Interaction attack
 public net.minecraft.world.entity.Interaction getHeight()F
 public net.minecraft.world.entity.Interaction getResponse()Z
@@ -219,16 +195,15 @@ public net.minecraft.world.entity.Interaction setHeight(F)V
 public net.minecraft.world.entity.Interaction setResponse(Z)V
 public net.minecraft.world.entity.Interaction setWidth(F)V
 public net.minecraft.world.entity.Interaction$PlayerAction
+public net.minecraft.world.entity.Interaction$PlayerAction <init>(Ljava/util/UUID;J)V
 public net.minecraft.world.entity.ItemBasedSteering boostTime
 public net.minecraft.world.entity.ItemBasedSteering boostTimeTotal()I
 public net.minecraft.world.entity.ItemBasedSteering boosting
 public net.minecraft.world.entity.LightningBolt flashes
 public net.minecraft.world.entity.LightningBolt life
-public net.minecraft.world.entity.LightningBolt visualOnly
 public net.minecraft.world.entity.LivingEntity DATA_ARROW_COUNT_ID
 public net.minecraft.world.entity.LivingEntity DATA_HEALTH_ID
 public net.minecraft.world.entity.LivingEntity LIVING_ENTITY_FLAG_SPIN_ATTACK
-public net.minecraft.world.entity.LivingEntity activeEffects
 public net.minecraft.world.entity.LivingEntity completeUsingItem()V
 public net.minecraft.world.entity.LivingEntity detectEquipmentUpdates()V
 public net.minecraft.world.entity.LivingEntity effectsDirty
@@ -237,10 +212,8 @@ public net.minecraft.world.entity.LivingEntity getDeathSound()Lnet/minecraft/sou
 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 playSecondaryHurtSound(Lnet/minecraft/world/damagesource/DamageSource;)V
@@ -250,103 +223,110 @@ public net.minecraft.world.entity.Mob getAmbientSound()Lnet/minecraft/sounds/Sou
 public net.minecraft.world.entity.Mob isSunBurnTick()Z
 public net.minecraft.world.entity.Mob lootTable
 public net.minecraft.world.entity.Mob lootTableSeed
+public net.minecraft.world.entity.Mob persistenceRequired
 public net.minecraft.world.entity.OminousItemSpawner setItem(Lnet/minecraft/world/item/ItemStack;)V
 public net.minecraft.world.entity.OminousItemSpawner spawnItemAfterTicks
+public net.minecraft.world.entity.ai.attributes.Attribute sentiment
 public net.minecraft.world.entity.ai.attributes.AttributeSupplier getAttributeInstance(Lnet/minecraft/core/Holder;)Lnet/minecraft/world/entity/ai/attributes/AttributeInstance;
-public net.minecraft.world.entity.ai.control.MoveControl$Operation
 public net.minecraft.world.entity.ai.gossip.GossipContainer gossips
 public net.minecraft.world.entity.ai.gossip.GossipContainer$EntityGossips
 public net.minecraft.world.entity.ai.gossip.GossipContainer$EntityGossips <init>()V
 public net.minecraft.world.entity.ai.navigation.PathNavigation pathFinder
 public net.minecraft.world.entity.ambient.Bat targetPosition
-public net.minecraft.world.entity.animal.AbstractSchoolingFish leader
-public net.minecraft.world.entity.animal.AbstractSchoolingFish schoolSize
-public net.minecraft.world.entity.animal.Animal inLove
 public net.minecraft.world.entity.animal.Animal loveCause
-public net.minecraft.world.entity.animal.Bee hivePos
-public net.minecraft.world.entity.animal.Bee isRolling()Z
-public net.minecraft.world.entity.animal.Bee numCropsGrownSincePollination
-public net.minecraft.world.entity.animal.Bee setHasNectar(Z)V
-public net.minecraft.world.entity.animal.Bee setHasStung(Z)V
-public net.minecraft.world.entity.animal.Bee setRolling(Z)V
-public net.minecraft.world.entity.animal.Bee stayOutOfHiveCountdown
-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 homePos
-public net.minecraft.world.entity.animal.Turtle setHasEgg(Z)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.bee.Bee isRolling()Z
+public net.minecraft.world.entity.animal.bee.Bee numCropsGrownSincePollination
+public net.minecraft.world.entity.animal.bee.Bee setHasNectar(Z)V
+public net.minecraft.world.entity.animal.bee.Bee setHasStung(Z)V
+public net.minecraft.world.entity.animal.bee.Bee setRolling(Z)V
+public net.minecraft.world.entity.animal.bee.Bee stayOutOfHiveCountdown
+public net.minecraft.world.entity.animal.bee.Bee ticksWithoutNectarSinceExitingHive
+public net.minecraft.world.entity.animal.bee.Bee timeSinceSting
+public net.minecraft.world.entity.animal.chicken.Chicken getSoundVariant()Lnet/minecraft/core/Holder;
+public net.minecraft.world.entity.animal.chicken.Chicken setSoundVariant(Lnet/minecraft/core/Holder;)V
+public net.minecraft.world.entity.animal.cow.Cow getSoundVariant()Lnet/minecraft/core/Holder;
+public net.minecraft.world.entity.animal.cow.Cow setSoundVariant(Lnet/minecraft/core/Holder;)V
+public net.minecraft.world.entity.animal.cow.MushroomCow setVariant(Lnet/minecraft/world/entity/animal/cow/MushroomCow$Variant;)V
+public net.minecraft.world.entity.animal.cow.MushroomCow stewEffects
+public net.minecraft.world.entity.animal.dolphin.Dolphin treasurePos
+public net.minecraft.world.entity.animal.equine.AbstractHorse createInventory()V
+public net.minecraft.world.entity.animal.equine.AbstractHorse inventory
+public net.minecraft.world.entity.animal.equine.AbstractHorse owner
+public net.minecraft.world.entity.animal.equine.Horse setVariantAndMarkings(Lnet/minecraft/world/entity/animal/equine/Variant;Lnet/minecraft/world/entity/animal/equine/Markings;)V
+public net.minecraft.world.entity.animal.equine.Llama setVariant(Lnet/minecraft/world/entity/animal/equine/Llama$Variant;)V
+public net.minecraft.world.entity.animal.equine.SkeletonHorse trapTime
+public net.minecraft.world.entity.animal.feline.Cat getSoundVariant()Lnet/minecraft/core/Holder;
+public net.minecraft.world.entity.animal.feline.Cat isRelaxStateOne()Z
+public net.minecraft.world.entity.animal.feline.Cat setCollarColor(Lnet/minecraft/world/item/DyeColor;)V
+public net.minecraft.world.entity.animal.feline.Cat setRelaxStateOne(Z)V
+public net.minecraft.world.entity.animal.feline.Cat setSoundVariant(Lnet/minecraft/core/Holder;)V
+public net.minecraft.world.entity.animal.feline.Cat setVariant(Lnet/minecraft/core/Holder;)V
+public net.minecraft.world.entity.animal.feline.Ocelot isTrusting()Z
+public net.minecraft.world.entity.animal.feline.Ocelot setTrusting(Z)V
+public net.minecraft.world.entity.animal.fish.AbstractSchoolingFish leader
+public net.minecraft.world.entity.animal.fish.AbstractSchoolingFish schoolSize
+public net.minecraft.world.entity.animal.fish.Salmon setVariant(Lnet/minecraft/world/entity/animal/fish/Salmon$Variant;)V
+public net.minecraft.world.entity.animal.fish.TropicalFish getPackedVariant()I
+public net.minecraft.world.entity.animal.fish.TropicalFish setPackedVariant(I)V
+public net.minecraft.world.entity.animal.fox.Fox DATA_TRUSTED_ID_0
+public net.minecraft.world.entity.animal.fox.Fox DATA_TRUSTED_ID_1
+public net.minecraft.world.entity.animal.fox.Fox isDefending()Z
+public net.minecraft.world.entity.animal.fox.Fox setDefending(Z)V
+public net.minecraft.world.entity.animal.fox.Fox setFaceplanted(Z)V
+public net.minecraft.world.entity.animal.fox.Fox setSleeping(Z)V
+public net.minecraft.world.entity.animal.fox.Fox setVariant(Lnet/minecraft/world/entity/animal/fox/Fox$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.nautilus.AbstractNautilus inventory
+public net.minecraft.world.entity.animal.panda.Panda getEatCounter()I
+public net.minecraft.world.entity.animal.panda.Panda setEatCounter(I)V
+public net.minecraft.world.entity.animal.parrot.Parrot setVariant(Lnet/minecraft/world/entity/animal/parrot/Parrot$Variant;)V
+public net.minecraft.world.entity.animal.pig.Pig getSoundVariant()Lnet/minecraft/core/Holder;
+public net.minecraft.world.entity.animal.pig.Pig setSoundVariant(Lnet/minecraft/core/Holder;)V
+public net.minecraft.world.entity.animal.pig.Pig setVariant(Lnet/minecraft/core/Holder;)V
+public net.minecraft.world.entity.animal.pig.Pig steering
+public net.minecraft.world.entity.animal.rabbit.Rabbit moreCarrotTicks
+public net.minecraft.world.entity.animal.rabbit.Rabbit setVariant(Lnet/minecraft/world/entity/animal/rabbit/Rabbit$Variant;)V
 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.squid.GlowSquid setDarkTicks(I)V
+public net.minecraft.world.entity.animal.turtle.Turtle goingHome
+public net.minecraft.world.entity.animal.turtle.Turtle setHasEgg(Z)V
 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
-public net.minecraft.world.entity.decoration.ItemFrame DATA_ITEM
-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.decoration.Mannequin ALL_LAYERS
+public net.minecraft.world.entity.decoration.Mannequin DEFAULT_DESCRIPTION
+public net.minecraft.world.entity.decoration.Mannequin VALID_POSES
+public net.minecraft.world.entity.decoration.Mannequin getDescription()Lnet/minecraft/network/chat/Component;
+public net.minecraft.world.entity.decoration.Mannequin getImmovable()Z
+public net.minecraft.world.entity.decoration.Mannequin setDescription(Lnet/minecraft/network/chat/Component;)V
+public net.minecraft.world.entity.decoration.Mannequin setHideDescription(Z)V
+public net.minecraft.world.entity.decoration.Mannequin setImmovable(Z)V
+public net.minecraft.world.entity.decoration.Mannequin setProfile(Lnet/minecraft/world/item/component/ResolvableProfile;)V
+public net.minecraft.world.entity.decoration.painting.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
@@ -364,19 +344,14 @@ 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.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 setWololoTarget(Lnet/minecraft/world/entity/animal/sheep/Sheep;)V
 public net.minecraft.world.entity.monster.Guardian randomStrollGoal
 public net.minecraft.world.entity.monster.Guardian setActiveAttackTarget(I)V
 public net.minecraft.world.entity.monster.Guardian$GuardianAttackGoal
 public net.minecraft.world.entity.monster.Guardian$GuardianAttackGoal attackTime
 public net.minecraft.world.entity.monster.Phantom anchorPoint
-public net.minecraft.world.entity.monster.Pillager inventory
 public net.minecraft.world.entity.monster.Ravager attackTick
 public net.minecraft.world.entity.monster.Ravager roarTick
 public net.minecraft.world.entity.monster.Ravager stunnedTick
@@ -384,74 +359,53 @@ public net.minecraft.world.entity.monster.Shulker DATA_COLOR_ID
 public net.minecraft.world.entity.monster.Shulker getRawPeekAmount()I
 public net.minecraft.world.entity.monster.Shulker setAttachFace(Lnet/minecraft/core/Direction;)V
 public net.minecraft.world.entity.monster.Shulker setRawPeekAmount(I)V
-public net.minecraft.world.entity.monster.Skeleton DATA_STRAY_CONVERSION_ID
-public net.minecraft.world.entity.monster.Skeleton conversionTime
-public net.minecraft.world.entity.monster.Skeleton inPowderSnowTime
-public net.minecraft.world.entity.monster.SpellcasterIllager getCurrentSpell()Lnet/minecraft/world/entity/monster/SpellcasterIllager$IllagerSpell;
-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.Vindicator DOOR_BREAKING_PREDICATE
-public net.minecraft.world.entity.monster.Vindicator isJohnny
+public net.minecraft.world.entity.monster.Vex owner
 public net.minecraft.world.entity.monster.Witch usingTime
-public net.minecraft.world.entity.monster.Zombie DATA_DROWNED_CONVERSION_ID
-public net.minecraft.world.entity.monster.Zombie DOOR_BREAKING_PREDICATE
-public net.minecraft.world.entity.monster.Zombie conversionTime
-public net.minecraft.world.entity.monster.Zombie isSunSensitive()Z
-public net.minecraft.world.entity.monster.Zombie startUnderWaterConversion(I)V
-public net.minecraft.world.entity.monster.ZombieVillager DATA_CONVERTING_ID
-public net.minecraft.world.entity.monster.ZombieVillager conversionStarter
-public net.minecraft.world.entity.monster.ZombieVillager startConverting(Ljava/util/UUID;I)V
-public net.minecraft.world.entity.monster.ZombieVillager villagerConversionTime
+public net.minecraft.world.entity.monster.cubemob.SulfurCube MAX_FUSE
+public net.minecraft.world.entity.monster.cubemob.SulfurCube setFuse(I)V
 public net.minecraft.world.entity.monster.hoglin.Hoglin cannotBeHunted
 public net.minecraft.world.entity.monster.hoglin.Hoglin isImmuneToZombification()Z
 public net.minecraft.world.entity.monster.hoglin.Hoglin timeInOverworld
+public net.minecraft.world.entity.monster.illager.Evoker getWololoTarget()Lnet/minecraft/world/entity/animal/sheep/Sheep;
+public net.minecraft.world.entity.monster.illager.Evoker setWololoTarget(Lnet/minecraft/world/entity/animal/sheep/Sheep;)V
+public net.minecraft.world.entity.monster.illager.SpellcasterIllager getCurrentSpell()Lnet/minecraft/world/entity/monster/illager/SpellcasterIllager$IllagerSpell;
+public net.minecraft.world.entity.monster.illager.SpellcasterIllager$IllagerSpell
+public net.minecraft.world.entity.monster.illager.Vindicator DOOR_BREAKING_PREDICATE
+public net.minecraft.world.entity.monster.illager.Vindicator isJohnny
 public net.minecraft.world.entity.monster.piglin.AbstractPiglin isImmuneToZombification()Z
 public net.minecraft.world.entity.monster.piglin.AbstractPiglin timeInOverworld
 public net.minecraft.world.entity.monster.piglin.Piglin cannotHunt
-public net.minecraft.world.entity.monster.piglin.Piglin inventory
 public net.minecraft.world.entity.monster.piglin.Piglin isChargingCrossbow()Z
+public net.minecraft.world.entity.monster.skeleton.Skeleton freezingTracker
 public net.minecraft.world.entity.monster.warden.WardenSpawnTracker cooldownTicks
 public net.minecraft.world.entity.monster.warden.WardenSpawnTracker increaseWarningLevel()V
 public net.minecraft.world.entity.monster.warden.WardenSpawnTracker ticksSinceLastWarning
-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.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.monster.zombie.Zombie DOOR_BREAKING_PREDICATE
+public net.minecraft.world.entity.monster.zombie.Zombie drowningTracker
+public net.minecraft.world.entity.monster.zombie.Zombie isSunSensitive()Z
+public net.minecraft.world.entity.monster.zombie.ZombieVillager DATA_CONVERTING_ID
+public net.minecraft.world.entity.monster.zombie.ZombieVillager conversionStarter
+public net.minecraft.world.entity.monster.zombie.ZombieVillager villagerConversionTime
+public net.minecraft.world.entity.npc.villager.Villager numberOfRestocksToday
+public net.minecraft.world.entity.npc.villager.Villager releaseAllPois()V
+public net.minecraft.world.entity.npc.villager.Villager setUnhappy()V
+public net.minecraft.world.entity.npc.villager.Villager updateDemand()V
+public net.minecraft.world.entity.npc.villager.Villager updateSpecialPrices(Lnet/minecraft/world/entity/player/Player;)V
+public net.minecraft.world.entity.npc.wanderingtrader.WanderingTrader getWanderTarget()Lnet/minecraft/core/BlockPos;
 public net.minecraft.world.entity.player.Inventory equipment
-public net.minecraft.world.entity.player.Player DATA_PLAYER_MODE_CUSTOMISATION
+public net.minecraft.world.entity.player.Player canCriticalAttack(Lnet/minecraft/world/entity/Entity;)Z
 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;
-public net.minecraft.world.entity.projectile.Arrow setPotionContents(Lnet/minecraft/world/item/alchemy/PotionContents;)V
-public net.minecraft.world.entity.projectile.Arrow updateColor()V
+public net.minecraft.world.entity.player.Player updatePlayerPose()V
 public net.minecraft.world.entity.projectile.EvokerFangs warmupDelayTicks
 public net.minecraft.world.entity.projectile.EyeOfEnder life
 public net.minecraft.world.entity.projectile.EyeOfEnder surviveAfterDeath
-public net.minecraft.world.entity.projectile.EyeOfEnder tx
-public net.minecraft.world.entity.projectile.EyeOfEnder ty
-public net.minecraft.world.entity.projectile.EyeOfEnder tz
+public net.minecraft.world.entity.projectile.EyeOfEnder target
 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
@@ -459,98 +413,94 @@ public net.minecraft.world.entity.projectile.FireworkRocketEntity attachedToEnti
 public net.minecraft.world.entity.projectile.FireworkRocketEntity getDefaultItem()Lnet/minecraft/world/item/ItemStack;
 public net.minecraft.world.entity.projectile.FireworkRocketEntity life
 public net.minecraft.world.entity.projectile.FireworkRocketEntity lifetime
-public net.minecraft.world.entity.projectile.FishingHook DATA_HOOKED_ENTITY
 public net.minecraft.world.entity.projectile.FishingHook calculateOpenWater(Lnet/minecraft/core/BlockPos;)Z
 public net.minecraft.world.entity.projectile.FishingHook currentState
 public net.minecraft.world.entity.projectile.FishingHook fishAngle
-public net.minecraft.world.entity.projectile.FishingHook hookedIn
 public net.minecraft.world.entity.projectile.FishingHook outOfWaterTime
 public net.minecraft.world.entity.projectile.FishingHook pullEntity(Lnet/minecraft/world/entity/Entity;)V
 public net.minecraft.world.entity.projectile.FishingHook setHookedEntity(Lnet/minecraft/world/entity/Entity;)V
 public net.minecraft.world.entity.projectile.FishingHook timeUntilHooked
 public net.minecraft.world.entity.projectile.FishingHook timeUntilLured
 public net.minecraft.world.entity.projectile.FishingHook$FishHookState
-public net.minecraft.world.entity.projectile.LargeFireball explosionPower
-public net.minecraft.world.entity.projectile.Projectile cachedOwner
 public net.minecraft.world.entity.projectile.Projectile hasBeenShot
 public net.minecraft.world.entity.projectile.Projectile leftOwner
-public net.minecraft.world.entity.projectile.Projectile ownerUUID
+public net.minecraft.world.entity.projectile.Projectile owner
 public net.minecraft.world.entity.projectile.ShulkerBullet currentMoveDirection
 public net.minecraft.world.entity.projectile.ShulkerBullet flightSteps
 public net.minecraft.world.entity.projectile.ShulkerBullet targetDeltaX
 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.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
-public net.minecraft.world.entity.projectile.windcharge.WindCharge explode(Lnet/minecraft/world/phys/Vec3;)V
+public net.minecraft.world.entity.projectile.arrow.AbstractArrow baseDamage
+public net.minecraft.world.entity.projectile.arrow.AbstractArrow firedFromWeapon
+public net.minecraft.world.entity.projectile.arrow.AbstractArrow getHitGroundSoundEvent()Lnet/minecraft/sounds/SoundEvent;
+public net.minecraft.world.entity.projectile.arrow.AbstractArrow getPickupItem()Lnet/minecraft/world/item/ItemStack;
+public net.minecraft.world.entity.projectile.arrow.AbstractArrow isInGround()Z
+public net.minecraft.world.entity.projectile.arrow.AbstractArrow life
+public net.minecraft.world.entity.projectile.arrow.AbstractArrow setPickupItemStack(Lnet/minecraft/world/item/ItemStack;)V
+public net.minecraft.world.entity.projectile.arrow.AbstractArrow setPierceLevel(B)V
+public net.minecraft.world.entity.projectile.arrow.Arrow NO_EFFECT_COLOR
+public net.minecraft.world.entity.projectile.arrow.Arrow getPotionContents()Lnet/minecraft/world/item/alchemy/PotionContents;
+public net.minecraft.world.entity.projectile.arrow.Arrow setPotionContents(Lnet/minecraft/world/item/alchemy/PotionContents;)V
+public net.minecraft.world.entity.projectile.arrow.SpectralArrow duration
+public net.minecraft.world.entity.projectile.arrow.ThrownTrident dealtDamage
+public net.minecraft.world.entity.projectile.hurtingprojectile.AbstractHurtingProjectile assignDirectionalMovement(Lnet/minecraft/world/phys/Vec3;D)V
+public net.minecraft.world.entity.projectile.hurtingprojectile.LargeFireball explosionPower
+public net.minecraft.world.entity.projectile.hurtingprojectile.windcharge.AbstractWindCharge explode(Lnet/minecraft/world/phys/Vec3;)V
 public net.minecraft.world.entity.raid.Raid heroesOfTheVillage
-public net.minecraft.world.entity.raid.Raid numGroups
 public net.minecraft.world.entity.raid.Raid raidEvent
-public net.minecraft.world.entity.raid.Raid raidOmenLevel
 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 getStatus()Lnet/minecraft/world/entity/vehicle/AbstractBoat$Status;
-public net.minecraft.world.entity.vehicle.AbstractBoat status
-public net.minecraft.world.entity.vehicle.AbstractMinecartContainer lootTable
-public net.minecraft.world.entity.vehicle.AbstractMinecartContainer lootTableSeed
-public net.minecraft.world.entity.vehicle.MinecartCommandBlock DATA_ID_COMMAND_NAME
-public net.minecraft.world.entity.vehicle.MinecartFurnace fuel
-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.entity.vehicle.boat.AbstractBoat getStatus()Lnet/minecraft/world/entity/vehicle/boat/AbstractBoat$Status;
+public net.minecraft.world.entity.vehicle.boat.AbstractBoat status
+public net.minecraft.world.entity.vehicle.minecart.MinecartCommandBlock DATA_ID_COMMAND_NAME
+public net.minecraft.world.entity.vehicle.minecart.MinecartFurnace fuel
+public net.minecraft.world.entity.vehicle.minecart.MinecartTNT explode(Lnet/minecraft/world/damagesource/DamageSource;D)V
+public net.minecraft.world.entity.vehicle.minecart.MinecartTNT explosionPowerBase
+public net.minecraft.world.entity.vehicle.minecart.MinecartTNT explosionSpeedFactor
+public net.minecraft.world.entity.vehicle.minecart.MinecartTNT fuse
 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
 public net.minecraft.world.inventory.AbstractContainerMenu resetQuickCraft()V
+public net.minecraft.world.inventory.AbstractContainerMenu synchronizeSlotToRemote(ILnet/minecraft/world/item/ItemStack;Ljava/util/function/Supplier;)V
+public net.minecraft.world.inventory.AbstractContainerMenu triggerSlotListeners(ILnet/minecraft/world/item/ItemStack;Ljava/util/function/Supplier;)V
 public net.minecraft.world.inventory.AbstractCraftingMenu craftSlots
 public net.minecraft.world.inventory.AbstractCraftingMenu resultSlots
+public net.minecraft.world.inventory.AbstractMountInventoryMenu SLOT_BODY_ARMOR
+public net.minecraft.world.inventory.AbstractMountInventoryMenu SLOT_INVENTORY_START
+public net.minecraft.world.inventory.AbstractMountInventoryMenu SLOT_SADDLE
+public net.minecraft.world.inventory.AbstractMountInventoryMenu mount
 public net.minecraft.world.inventory.AnvilMenu cost
 public net.minecraft.world.inventory.AnvilMenu itemName
 public net.minecraft.world.inventory.AnvilMenu repairItemCountCost
+public net.minecraft.world.inventory.BrewingStandMenu DATA_COUNT
 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.LecternMenu DATA_COUNT
 public net.minecraft.world.inventory.MerchantContainer selectionHint
-public net.minecraft.world.inventory.Slot slot
 public net.minecraft.world.item.AdventureModePredicate predicates
-public net.minecraft.world.item.BucketItem content
 public net.minecraft.world.item.CrossbowItem FIREWORK_POWER
-public net.minecraft.world.item.DebugStickItem handleInteraction(Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;ZLnet/minecraft/world/item/ItemStack;)Z
-public net.minecraft.world.item.ItemCooldowns cooldowns
-public net.minecraft.world.item.ItemCooldowns tickCount
-public net.minecraft.world.item.ItemCooldowns$CooldownInstance
+public net.minecraft.world.item.DebugStickItem handleInteraction(Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;ZLnet/minecraft/world/item/ItemStack;)Z
 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.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.component.ResolvableProfile unpack()Lcom/mojang/datafixers/util/Either;
+public net.minecraft.world.item.component.ResolvableProfile$Dynamic <init>(Lcom/mojang/datafixers/util/Either;Lnet/minecraft/world/entity/player/PlayerSkin$Patch;)V
+public net.minecraft.world.item.component.ResolvableProfile$Partial
+public net.minecraft.world.item.component.ResolvableProfile$Partial <init>(Ljava/util/Optional;Ljava/util/Optional;Lcom/mojang/authlib/properties/PropertyMap;)V
+public net.minecraft.world.item.component.ResolvableProfile$Partial MAP_CODEC
+public net.minecraft.world.item.component.ResolvableProfile$Static <init>(Lcom/mojang/datafixers/util/Either;Lnet/minecraft/world/entity/player/PlayerSkin$Patch;)V
 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.Ingredient values
 public net.minecraft.world.item.crafting.RecipeMap byKey
 public net.minecraft.world.item.crafting.RecipeMap byType
 public net.minecraft.world.item.trading.MerchantOffer demand
-public net.minecraft.world.item.trading.MerchantOffer result
-public net.minecraft.world.item.trading.MerchantOffer specialPriceDiff
 public net.minecraft.world.item.trading.MerchantOffer uses
 public net.minecraft.world.level.BaseSpawner delay(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)V
 public net.minecraft.world.level.BaseSpawner isNearPlayer(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)Z
@@ -564,14 +514,10 @@ public net.minecraft.world.level.BaseSpawner spawnCount
 public net.minecraft.world.level.BaseSpawner spawnDelay
 public net.minecraft.world.level.BaseSpawner spawnPotentials
 public net.minecraft.world.level.BaseSpawner spawnRange
-public net.minecraft.world.level.GameRules GAME_RULE_TYPES
-public net.minecraft.world.level.GameRules$Value deserialize(Ljava/lang/String;)V
-public net.minecraft.world.level.GameRules$Value onChanged(Lnet/minecraft/server/MinecraftServer;)V
+public net.minecraft.world.level.Level DEFAULT_EXPLOSION_BLOCK_PARTICLES
 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
-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
@@ -579,98 +525,83 @@ 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
+public net.minecraft.world.level.biome.Biome$ClimateSettings <init>(ZFLnet/minecraft/world/level/biome/Biome$TemperatureModifier;F)V
 public net.minecraft.world.level.block.Block popExperience(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;I)V
-public net.minecraft.world.level.block.ChestBlock isBlockedChestByBlock(Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Z
-public net.minecraft.world.level.block.ChiseledBookShelfBlock getHitSlot(Lnet/minecraft/world/phys/BlockHitResult;Lnet/minecraft/world/level/block/state/BlockState;)Ljava/util/OptionalInt;
-public net.minecraft.world.level.block.ChiseledBookShelfBlock getSection(F)I
 public net.minecraft.world.level.block.ComposterBlock$EmptyContainer
 public net.minecraft.world.level.block.ComposterBlock$InputContainer
 public net.minecraft.world.level.block.ComposterBlock$OutputContainer
 public net.minecraft.world.level.block.DispenserBlock dispenseFrom(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;)V
-public net.minecraft.world.level.block.DropperBlock dispenseFrom(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;)V
 public net.minecraft.world.level.block.FireBlock igniteOdds
-public net.minecraft.world.level.block.RedStoneWireBlock canSurvive(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelReader;Lnet/minecraft/core/BlockPos;)Z
-public net.minecraft.world.level.block.RedStoneWireBlock shouldSignal
-public net.minecraft.world.level.block.ShulkerBoxBlock color
-public net.minecraft.world.level.block.SoundType breakSound
-public net.minecraft.world.level.block.SoundType hitSound
+public net.minecraft.world.level.block.RedstoneWireBlock canSurvive(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelReader;Lnet/minecraft/core/BlockPos;)Z
+public net.minecraft.world.level.block.RedstoneWireBlock shouldSignal
+public net.minecraft.world.level.block.SelectableSlotContainer getSection(FI)I
 public net.minecraft.world.level.block.TurtleEggBlock decreaseEggs(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)V
 public net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity cookingTimer
 public net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity cookingTotalTime
 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 quickCheck
 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
 public net.minecraft.world.level.block.entity.BaseContainerBlockEntity lockKey
 public net.minecraft.world.level.block.entity.BaseContainerBlockEntity name
 public net.minecraft.world.level.block.entity.BeaconBlockEntity levels
 public net.minecraft.world.level.block.entity.BeaconBlockEntity lockKey
-public net.minecraft.world.level.block.entity.BeaconBlockEntity name
 public net.minecraft.world.level.block.entity.BeaconBlockEntity primaryPower
 public net.minecraft.world.level.block.entity.BeaconBlockEntity secondaryPower
-public net.minecraft.world.level.block.entity.BedBlockEntity color
 public net.minecraft.world.level.block.entity.BeehiveBlockEntity savedFlowerPos
 public net.minecraft.world.level.block.entity.BellBlockEntity resonating
 public net.minecraft.world.level.block.entity.BellBlockEntity resonationTicks
-public net.minecraft.world.level.block.entity.BlockEntity saveId(Lnet/minecraft/nbt/CompoundTag;)V
+public net.minecraft.world.level.block.entity.BlockEntity saveId(Lnet/minecraft/world/level/storage/ValueOutput;)V
 public net.minecraft.world.level.block.entity.BlockEntityType validBlocks
 public net.minecraft.world.level.block.entity.BrewingStandBlockEntity brewTime
 public net.minecraft.world.level.block.entity.BrewingStandBlockEntity fuel
+public net.minecraft.world.level.block.entity.BrewingStandBlockEntity totalBrewTime
 public net.minecraft.world.level.block.entity.BrushableBlockEntity item
 public net.minecraft.world.level.block.entity.BrushableBlockEntity lootTable
 public net.minecraft.world.level.block.entity.BrushableBlockEntity lootTableSeed
 public net.minecraft.world.level.block.entity.CampfireBlockEntity cookingProgress
 public net.minecraft.world.level.block.entity.CampfireBlockEntity cookingTime
+public net.minecraft.world.level.block.entity.ChestBlockEntity DEFAULT_NAME
 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.CreakingHeartBlockEntity clearCreakingInfo()V
+public net.minecraft.world.level.block.entity.CreakingHeartBlockEntity getCreakingProtector()Ljava/util/Optional;
+public net.minecraft.world.level.block.entity.CreakingHeartBlockEntity spawnProtector(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/block/entity/CreakingHeartBlockEntity;)Lnet/minecraft/world/entity/monster/creaking/Creaking;
+public net.minecraft.world.level.block.entity.CreakingHeartBlockEntity spreadResin(Lnet/minecraft/server/level/ServerLevel;)Ljava/util/Optional;
 public net.minecraft.world.level.block.entity.DecoratedPotBlockEntity decorations
 public net.minecraft.world.level.block.entity.EnderChestBlockEntity openersCounter
 public net.minecraft.world.level.block.entity.HopperBlockEntity cooldownTime
 public net.minecraft.world.level.block.entity.HopperBlockEntity setCooldown(I)V
 public net.minecraft.world.level.block.entity.LecternBlockEntity bookAccess
 public net.minecraft.world.level.block.entity.LecternBlockEntity setPage(I)V
-public net.minecraft.world.level.block.entity.RandomizableContainerBlockEntity lootTable
-public net.minecraft.world.level.block.entity.RandomizableContainerBlockEntity lootTableSeed
 public net.minecraft.world.level.block.entity.SculkCatalystBlockEntity$CatalystListener bloom(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/util/RandomSource;)V
-public net.minecraft.world.level.block.entity.SculkSensorBlockEntity lastVibrationFrequency
 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.SignBlockEntity allowOpFeatures
 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
 public net.minecraft.world.level.block.entity.StructureBlockEntity ignoreEntities
-public net.minecraft.world.level.block.entity.StructureBlockEntity integrity
-public net.minecraft.world.level.block.entity.StructureBlockEntity metaData
-public net.minecraft.world.level.block.entity.StructureBlockEntity mirror
 public net.minecraft.world.level.block.entity.StructureBlockEntity mode
-public net.minecraft.world.level.block.entity.StructureBlockEntity rotation
-public net.minecraft.world.level.block.entity.StructureBlockEntity seed
-public net.minecraft.world.level.block.entity.StructureBlockEntity showAir
-public net.minecraft.world.level.block.entity.StructureBlockEntity showBoundingBox
-public net.minecraft.world.level.block.entity.StructureBlockEntity structurePos
-public net.minecraft.world.level.block.entity.StructureBlockEntity structureSize
 public net.minecraft.world.level.block.entity.TheEndGatewayBlockEntity age
 public net.minecraft.world.level.block.entity.TheEndGatewayBlockEntity exactTeleport
 public net.minecraft.world.level.block.entity.TheEndGatewayBlockEntity exitPortal
-public net.minecraft.world.level.block.entity.TrialSpawnerBlockEntity trialSpawner
+public net.minecraft.world.level.block.entity.trialspawner.TrialSpawner config
 public net.minecraft.world.level.block.entity.trialspawner.TrialSpawner isOminous
-public net.minecraft.world.level.block.entity.trialspawner.TrialSpawner stateAccessor
-public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerData cooldownEndsAt
-public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerData currentMobs
-public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerData detectedPlayers
-public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerData nextMobSpawnsAt
-public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerData nextSpawnData
+public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerStateData cooldownEndsAt
+public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerStateData currentMobs
+public net.minecraft.world.level.block.entity.trialspawner.TrialSpawnerStateData detectedPlayers
+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
@@ -678,108 +609,78 @@ public net.minecraft.world.level.block.entity.vault.VaultServerData stateUpdatin
 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
-public net.minecraft.world.level.block.state.StateHolder PROPERTY_ENTRY_TO_STRING_FUNCTION
 public net.minecraft.world.level.block.state.properties.IntegerProperty max
 public net.minecraft.world.level.block.state.properties.IntegerProperty min
 public net.minecraft.world.level.chunk.ChunkAccess blockEntities
 public net.minecraft.world.level.chunk.ChunkAccess heightmaps
 public net.minecraft.world.level.chunk.ChunkGenerator generationSettingsGetter
-public net.minecraft.world.level.chunk.LevelChunk level
-public net.minecraft.world.level.chunk.LevelChunk loaded
-public net.minecraft.world.level.chunk.LevelChunkSection states
-public net.minecraft.world.level.chunk.PalettedContainer registry
-public net.minecraft.world.level.chunk.status.ChunkStatusTasks postLoadProtoChunk(Lnet/minecraft/server/level/ServerLevel;Ljava/util/List;)V
+public net.minecraft.world.level.chunk.status.ChunkStatusTasks postLoadProtoChunk(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/storage/ValueInput$ValueInputList;)V
 public net.minecraft.world.level.chunk.storage.EntityStorage entityDeserializerQueue
 public net.minecraft.world.level.chunk.storage.EntityStorage level
-public net.minecraft.world.level.chunk.storage.RegionFileStorage regionCache
-public net.minecraft.world.level.chunk.storage.SerializableChunkData BLOCK_STATE_CODEC
-public net.minecraft.world.level.dimension.end.EndDragonFight GATEWAY_COUNT
-public net.minecraft.world.level.dimension.end.EndDragonFight dragonEvent
-public net.minecraft.world.level.dimension.end.EndDragonFight dragonUUID
-public net.minecraft.world.level.dimension.end.EndDragonFight findExitPortal()Lnet/minecraft/world/level/block/state/pattern/BlockPattern$BlockPatternMatch;
-public net.minecraft.world.level.dimension.end.EndDragonFight gateways
-public net.minecraft.world.level.dimension.end.EndDragonFight level
-public net.minecraft.world.level.dimension.end.EndDragonFight portalLocation
-public net.minecraft.world.level.dimension.end.EndDragonFight previouslyKilled
-public net.minecraft.world.level.dimension.end.EndDragonFight respawnCrystals
-public net.minecraft.world.level.dimension.end.EndDragonFight respawnDragon(Ljava/util/List;)V
-public net.minecraft.world.level.dimension.end.EndDragonFight respawnStage
-public net.minecraft.world.level.dimension.end.EndDragonFight setRespawnStage(Lnet/minecraft/world/level/dimension/end/DragonRespawnAnimation;)V
-public net.minecraft.world.level.dimension.end.EndDragonFight spawnExitPortal(Z)V
-public net.minecraft.world.level.dimension.end.EndDragonFight spawnNewGateway(Lnet/minecraft/core/BlockPos;)V
+public net.minecraft.world.level.dimension.end.EnderDragonFight GATEWAY_COUNT
+public net.minecraft.world.level.dimension.end.EnderDragonFight dragonEvent
+public net.minecraft.world.level.dimension.end.EnderDragonFight exitPortalLocation
+public net.minecraft.world.level.dimension.end.EnderDragonFight findExitPortal()Lnet/minecraft/world/level/block/state/pattern/BlockPattern$BlockPatternMatch;
+public net.minecraft.world.level.dimension.end.EnderDragonFight gateways
+public net.minecraft.world.level.dimension.end.EnderDragonFight hasPreviouslyKilledDragon
+public net.minecraft.world.level.dimension.end.EnderDragonFight level
+public net.minecraft.world.level.dimension.end.EnderDragonFight respawnCrystals
+public net.minecraft.world.level.dimension.end.EnderDragonFight respawnDragon(Ljava/util/List;)V
+public net.minecraft.world.level.dimension.end.EnderDragonFight respawnStage
+public net.minecraft.world.level.dimension.end.EnderDragonFight setRespawnStage(Lnet/minecraft/world/level/dimension/end/DragonRespawnStage;)V
+public net.minecraft.world.level.dimension.end.EnderDragonFight spawnExitPortal(Z)V
+public net.minecraft.world.level.dimension.end.EnderDragonFight spawnNewGateway(Lnet/minecraft/core/BlockPos;)V
 public net.minecraft.world.level.entity.PersistentEntitySectionManager ensureChunkQueuedForLoad(J)V
 public net.minecraft.world.level.entity.PersistentEntitySectionManager permanentStorage
-public net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator settings
-public net.minecraft.world.level.levelgen.SurfaceRules$Condition
-public net.minecraft.world.level.levelgen.SurfaceRules$Context
-public net.minecraft.world.level.levelgen.SurfaceRules$Context blockX
-public net.minecraft.world.level.levelgen.SurfaceRules$Context blockY
-public net.minecraft.world.level.levelgen.SurfaceRules$Context blockZ
-public net.minecraft.world.level.levelgen.SurfaceRules$Context context
-public net.minecraft.world.level.levelgen.SurfaceRules$Context randomState
-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.gamerules.GameRules rules
+public net.minecraft.world.level.levelgen.material.MaterialRuleContext context
 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
-public net.minecraft.world.level.levelgen.structure.placement.StructurePlacement locateOffset
-public net.minecraft.world.level.levelgen.structure.placement.StructurePlacement salt
+public net.minecraft.world.level.levelgen.structure.placement.AbstractSpreadingStructurePlacement exclusionZone
+public net.minecraft.world.level.levelgen.structure.placement.AbstractSpreadingStructurePlacement frequency
+public net.minecraft.world.level.levelgen.structure.placement.AbstractSpreadingStructurePlacement frequencyReductionMethod
+public net.minecraft.world.level.levelgen.structure.placement.AbstractSpreadingStructurePlacement locateOffset
+public net.minecraft.world.level.levelgen.structure.placement.AbstractSpreadingStructurePlacement salt
 public net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate entityInfoList
 public net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate palettes
-public net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplateManager loadFromGenerated(Lnet/minecraft/resources/ResourceLocation;)Ljava/util/Optional;
-public net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplateManager loadFromResource(Lnet/minecraft/resources/ResourceLocation;)Ljava/util/Optional;
-public net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplateManager readStructure(Ljava/io/InputStream;)Lnet/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate;
+public net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplateManager resourceManagerSource
 public net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplateManager structureRepository
-public net.minecraft.world.level.material.MapColor MATERIAL_COLORS
+public net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplateManager tryLoad(Lnet/minecraft/resources/Identifier;)Ljava/util/Optional;
+public net.minecraft.world.level.levelgen.structure.templatesystem.loader.TemplateSource readStructure(Ljava/io/InputStream;)Lnet/minecraft/nbt/CompoundTag;
+public net.minecraft.world.level.levelgen.structure.templatesystem.loader.TemplateSource readStructure(Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate;
 public net.minecraft.world.level.pathfinder.Path nodes
 public net.minecraft.world.level.pathfinder.PathFinder nodeEvaluator
 public net.minecraft.world.level.saveddata.maps.MapItemSavedData carriedBy
 public net.minecraft.world.level.saveddata.maps.MapItemSavedData carriedByPlayers
 public net.minecraft.world.level.saveddata.maps.MapItemSavedData decorations
-public net.minecraft.world.level.saveddata.maps.MapItemSavedData setColorsDirty(II)V
-public net.minecraft.world.level.saveddata.maps.MapItemSavedData setDecorationsDirty()V
-public net.minecraft.world.level.storage.DimensionDataStorage cache
-public net.minecraft.world.level.storage.LevelStorageSource baseDir
-public net.minecraft.world.level.storage.LevelStorageSource$LevelStorageAccess levelDirectory
 public net.minecraft.world.level.storage.PrimaryLevelData settings
-public net.minecraft.world.scores.Objective displayName
+public net.minecraft.world.level.storage.SavedDataStorage cache
+public net.minecraft.world.level.storage.TagValueInput input
+public net.minecraft.world.level.storage.loot.providers.number.ints.ResolvableInt$Reference getProvider(Lnet/minecraft/world/level/storage/loot/LootContext;)Ljava/util/Optional;
 public net.minecraft.world.scores.criteria.ObjectiveCriteria CRITERIA_CACHE
-public-f net.minecraft.server.MinecraftServer potionBrewing
 public-f net.minecraft.server.MinecraftServer storageSource
-public-f net.minecraft.server.ReloadableServerResources commands
+public-f net.minecraft.server.ServerAdvancementManager advancements
 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.players.PlayerList maxPlayers
+public-f net.minecraft.world.entity.Entity doTeamsAllowDamage(Lnet/minecraft/world/entity/Entity;)Z
 public-f net.minecraft.world.entity.LivingEntity combatTracker
-public-f net.minecraft.world.entity.LivingEntity invulnerableDuration
-public-f net.minecraft.world.entity.Mob goalSelector
 public-f net.minecraft.world.entity.Mob targetSelector
 public-f net.minecraft.world.entity.ai.attributes.RangedAttribute maxValue
 public-f net.minecraft.world.entity.player.Player gameProfile
+public-f net.minecraft.world.entity.raid.Raid numGroups
 public-f net.minecraft.world.inventory.AbstractContainerMenu dataSlots
 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.crafting.RecipeManager recipes
 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
 public-f net.minecraft.world.item.trading.MerchantOffer priceMultiplier
 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

@@ -14,14 +14,14 @@ tiny	2	0	mojang	spigot
 
 # CraftBukkit changes type
 c	net/minecraft/server/level/ServerLevel	net/minecraft/server/level/WorldServer
-	f	Lnet/minecraft/world/level/storage/PrimaryLevelData;	serverLevelData	L
+	f	Lnet/minecraft/world/level/storage/PrimaryLevelData;	serverLevelData	I
 
 c	net/minecraft/world/level/chunk/LevelChunk	net/minecraft/world/level/chunk/Chunk
-	f	Lnet/minecraft/server/level/ServerLevel;	level	r
+	f	Lnet/minecraft/server/level/ServerLevel;	level	q
 
 # See mappings-patch.tiny
 c	net/minecraft/server/level/ChunkMap	net/minecraft/server/level/PlayerChunkMap
-	f	Lnet/minecraft/server/level/ChunkMap$ChunkDistanceManager;	distanceManager	G
+	f	Lnet/minecraft/server/level/ChunkMap$ChunkDistanceManager;	distanceManager	D
 
 # 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,42 +1,64 @@
+import io.papermc.paperweight.checkstyle.PaperCheckstyleExt
+import io.papermc.paperweight.checkstyle.tasks.PaperCheckstyleTask
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
-    id("io.papermc.paperweight.core") version "2.0.0-beta.17" apply false
+    id("io.papermc.paperweight.core") version "2.0.0-beta.24" apply false
 }
 
 subprojects {
-    apply(plugin = "java-library")
-    apply(plugin = "maven-publish")
+    apply {
+        plugin("java-library")
+        plugin("maven-publish")
+    }
 
     extensions.configure<JavaPluginExtension> {
         toolchain {
-            languageVersion = JavaLanguageVersion.of(21)
+            languageVersion = JavaLanguageVersion.of(25)
         }
     }
 
-    tasks.withType<AbstractArchiveTask>().configureEach {
-        isPreserveFileTimestamps = false
-        isReproducibleFileOrder = true
+    val tempDisabled = setOf("paper-server", "paper-generator", "test-plugin")
+
+    if (name !in tempDisabled) {
+        apply { plugin("io.papermc.paperweight.paper-checkstyle") }
+        extensions.configure<PaperCheckstyleExt> {
+            typeUseAnnotationsFile.set(rootProject.layout.projectDirectory.file(".checkstyle/type_use_annotations.txt"))
+        }
+
+        /*tasks.withType<PaperCheckstyleTask>().configureEach {
+            configDirectory = rootProject.layout.projectDirectory.dir(".checkstyle")
+            // configFile = layout.projectDirectory.file(".checkstyle/checkstyle.xml").asFile // use the base file if not overwritten
+            maxHeapSize = "2g"
+            reports {
+                xml.required = true
+                html.required = true
+            }
+        }*/
+
+        dependencies {
+            "checkstyle"(project(":paper-checkstyle"))
+        }
     }
 }
 
 val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
 
 subprojects {
-    tasks.withType<JavaCompile> {
+    tasks.withType<JavaCompile>().configureEach {
         options.encoding = Charsets.UTF_8.name()
-        options.release = 21
+        options.release = 25
         options.isFork = true
         options.compilerArgs.addAll(listOf("-Xlint:-deprecation", "-Xlint:-removal"))
     }
-    tasks.withType<Javadoc> {
+    tasks.withType<Javadoc>().configureEach {
         options.encoding = Charsets.UTF_8.name()
     }
-    tasks.withType<ProcessResources> {
+    tasks.withType<ProcessResources>().configureEach {
         filteringCharset = Charsets.UTF_8.name()
     }
-    tasks.withType<Test> {
+    tasks.withType<Test>().configureEach {
         testLogging {
             showStackTraces = true
             exceptionFormat = TestExceptionFormat.FULL
@@ -51,8 +73,8 @@ subprojects {
 
     extensions.configure<PublishingExtension> {
         repositories {
-            maven("https://repo.papermc.io/repository/maven-snapshots/") {
-                name = "paperSnapshots"
+            maven("https://artifactory.papermc.io/artifactory/releases/") {
+                name = "paperReleases"
                 credentials(PasswordCredentials::class)
             }
         }

gradle.properties

@@ -1,10 +1,12 @@
 group=io.papermc.paper
-version=1.21.5-R0.1-SNAPSHOT
-mcVersion=1.21.5
+mcVersion=26.3
+# This is the current API version for use in (paper-)plugin.yml files
+# During snapshot cycles this should be the anticipated version of the release target
+apiVersion=26.3
+channel=STABLE
 
 # Set to true while updating Minecraft version
-updatingMinecraft=true
-updateTaskListIssue=https://github.com/PaperMC/Paper/issues/11736
+updatingMinecraft=false
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 
 ##############################################################################
 #
-#   Gradle start up script for POSIX generated by Gradle.
+#   gradlew start up script for POSIX generated by Gradle.
 #
 #   Important for running:
 #
@@ -29,7 +29,7 @@
 #       bash, then to run this script, type that shell name before the whole
 #       command line, like:
 #
-#           ksh Gradle
+#           ksh gradlew
 #
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 

gradlew.bat

@@ -19,12 +19,39 @@
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
-@rem  Gradle startup script for Windows
+@rem  gradlew startup script for Windows
 @rem
 @rem ##########################################################################
 
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
+@rem Set local scope for the variables, and ensure extensions are enabled
+setlocal EnableExtensions
+
+@rem Catch executions from older scripts and ensure they exit cleanly.
+@rem This can be removed once we can be reasonably confident that few people
+@rem will be migrating directly to this new wrapper.
+goto afterSafetyNet
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+goto exitWithErrorLevel
+:afterSafetyNet
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
@@ -45,13 +72,14 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+1>&2 echo.
+1>&2 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+1>&2 echo.
+1>&2 echo Please set the JAVA_HOME variable in your environment to match the
+1>&2 echo location of your Java installation.
 
-goto fail
+"%COMSPEC%" /c exit 1
+goto exitWithErrorLevel
 
 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
@@ -59,36 +87,26 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+1>&2 echo.
+1>&2 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+1>&2 echo.
+1>&2 echo Please set the JAVA_HOME variable in your environment to match the
+1>&2 echo location of your Java installation.
 
-goto fail
+"%COMSPEC%" /c exit 1
+goto exitWithErrorLevel
 
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
 
 
-@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" %*
+@rem Execute gradlew
+@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
+@rem which allows us to clear the local environment before executing the java command
+endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel & goto exitWithErrorLevel
 
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem This label must not be changed. We rely on old scripts being able to jump to this point.
+:exitWithErrorLevel
+@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
+"%COMSPEC%" /c exit %ERRORLEVEL%

paper-api/.checkstyle/checkstyle.xml

@@ -0,0 +1,31 @@
+<!DOCTYPE module PUBLIC
+    "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+    "https://checkstyle.org/dtds/configuration_1_3.dtd">
+<module name="Checker">
+    <!--Single Suppression Filters-->
+    <module name="io.papermc.checkstyle.filters.BetterSuppressionSingleFilter">
+        <property name="checks" value="Javadoc(Method|Type)"/>
+        <property name="messageKey" value="javadoc\.unknownTag"/>
+        <!--[A-Z].* check is for java annotations inside code blocks inside Javadocs-->
+        <property name="arguments" value="(${custom_javadoc_tags}|[A-Z].*)"/>
+    </module>
+    <module name="TreeWalker">
+        <!--Skip generated content by typewriter-->
+        <module name="SuppressionCommentFilter">
+            <property name="offCommentFormat" value="Start generate - \w+$"/>
+            <property name="onCommentFormat" value="End generate - \w+$"/>
+        </module>
+        <module name="JavadocVariable">
+            <!--requires on public fields-->
+            <property name="accessModifiers" value="public"/>
+        </module>
+        <module name="MissingJavadocMethod">
+            <property name="allowedAnnotations" value="Override, ApiStatus.Internal"/>
+            <property name="ignoreMethodNamesRegex" value="^getHandlerList$"/>
+        </module>
+        <module name="MissingJavadocPackage"/>
+        <module name="MissingJavadocType">
+            <property name="skipAnnotations" value="Generated, ApiStatus.Internal"/>
+        </module>
+    </module>
+</module>

paper-api/.checkstyle/ignored_directories.txt

@@ -0,0 +1,201 @@
+paper-api/src/generated/java/com/destroystokyo/paper/entity/ai/
+paper-api/src/generated/java/io/papermc/paper/registry/keys/
+paper-api/src/generated/java/io/papermc/paper/registry/keys/tags/
+paper-api/src/main/java/co/aikar/timings/
+paper-api/src/main/java/co/aikar/util/
+paper-api/src/main/java/com/destroystokyo/paper/
+paper-api/src/main/java/com/destroystokyo/paper/block/
+paper-api/src/main/java/com/destroystokyo/paper/brigadier/
+paper-api/src/main/java/com/destroystokyo/paper/entity/
+paper-api/src/main/java/com/destroystokyo/paper/entity/ai/
+paper-api/src/main/java/com/destroystokyo/paper/entity/villager/
+paper-api/src/main/java/com/destroystokyo/paper/event/block/
+paper-api/src/main/java/com/destroystokyo/paper/event/brigadier/
+paper-api/src/main/java/com/destroystokyo/paper/event/entity/
+paper-api/src/main/java/com/destroystokyo/paper/event/inventory/
+paper-api/src/main/java/com/destroystokyo/paper/event/player/
+paper-api/src/main/java/com/destroystokyo/paper/event/profile/
+paper-api/src/main/java/com/destroystokyo/paper/event/server/
+paper-api/src/main/java/com/destroystokyo/paper/exception/
+paper-api/src/main/java/com/destroystokyo/paper/inventory/meta/
+paper-api/src/main/java/com/destroystokyo/paper/loottable/
+paper-api/src/main/java/com/destroystokyo/paper/network/
+paper-api/src/main/java/com/destroystokyo/paper/profile/
+paper-api/src/main/java/com/destroystokyo/paper/util/
+paper-api/src/main/java/com/destroystokyo/paper/utils/
+paper-api/src/main/java/io/papermc/paper/advancement/
+paper-api/src/main/java/io/papermc/paper/annotation/
+paper-api/src/main/java/io/papermc/paper/ban/
+paper-api/src/main/java/io/papermc/paper/block/
+paper-api/src/main/java/io/papermc/paper/block/bed/
+paper-api/src/main/java/io/papermc/paper/block/fluid/
+paper-api/src/main/java/io/papermc/paper/block/fluid/type/
+paper-api/src/main/java/io/papermc/paper/brigadier/
+paper-api/src/main/java/io/papermc/paper/chat/
+paper-api/src/main/java/io/papermc/paper/command/
+paper-api/src/main/java/io/papermc/paper/command/brigadier/
+paper-api/src/main/java/io/papermc/paper/command/brigadier/argument/
+paper-api/src/main/java/io/papermc/paper/command/brigadier/argument/position/
+paper-api/src/main/java/io/papermc/paper/command/brigadier/argument/predicate/
+paper-api/src/main/java/io/papermc/paper/command/brigadier/argument/range/
+paper-api/src/main/java/io/papermc/paper/command/brigadier/argument/resolvers/
+paper-api/src/main/java/io/papermc/paper/command/brigadier/argument/resolvers/selector/
+paper-api/src/main/java/io/papermc/paper/configuration/
+paper-api/src/main/java/io/papermc/paper/connection/
+paper-api/src/main/java/io/papermc/paper/datacomponent/
+paper-api/src/main/java/io/papermc/paper/datacomponent/item/
+paper-api/src/main/java/io/papermc/paper/datacomponent/item/attribute/
+paper-api/src/main/java/io/papermc/paper/datacomponent/item/blocksattacks/
+paper-api/src/main/java/io/papermc/paper/datacomponent/item/consumable/
+paper-api/src/main/java/io/papermc/paper/datapack/
+paper-api/src/main/java/io/papermc/paper/dialog/
+paper-api/src/main/java/io/papermc/paper/enchantments/
+paper-api/src/main/java/io/papermc/paper/entity/
+paper-api/src/main/java/io/papermc/paper/entity/poi/
+paper-api/src/main/java/io/papermc/paper/event/block/
+paper-api/src/main/java/io/papermc/paper/event/connection/
+paper-api/src/main/java/io/papermc/paper/event/connection/configuration/
+paper-api/src/main/java/io/papermc/paper/event/entity/
+paper-api/src/main/java/io/papermc/paper/event/executor/
+paper-api/src/main/java/io/papermc/paper/event/inventory/
+paper-api/src/main/java/io/papermc/paper/event/packet/
+paper-api/src/main/java/io/papermc/paper/event/player/
+paper-api/src/main/java/io/papermc/paper/event/server/
+paper-api/src/main/java/io/papermc/paper/event/world/
+paper-api/src/main/java/io/papermc/paper/event/world/border/
+paper-api/src/main/java/io/papermc/paper/generated/
+paper-api/src/main/java/io/papermc/paper/inventory/
+paper-api/src/main/java/io/papermc/paper/inventory/tooltip/
+paper-api/src/main/java/io/papermc/paper/item/
+paper-api/src/main/java/io/papermc/paper/persistence/
+paper-api/src/main/java/io/papermc/paper/plugin/
+paper-api/src/main/java/io/papermc/paper/plugin/bootstrap/
+paper-api/src/main/java/io/papermc/paper/plugin/configuration/
+paper-api/src/main/java/io/papermc/paper/plugin/lifecycle/event/
+paper-api/src/main/java/io/papermc/paper/plugin/lifecycle/event/handler/
+paper-api/src/main/java/io/papermc/paper/plugin/lifecycle/event/handler/configuration/
+paper-api/src/main/java/io/papermc/paper/plugin/lifecycle/event/registrar/
+paper-api/src/main/java/io/papermc/paper/plugin/lifecycle/event/types/
+paper-api/src/main/java/io/papermc/paper/plugin/loader/
+paper-api/src/main/java/io/papermc/paper/plugin/loader/library/
+paper-api/src/main/java/io/papermc/paper/plugin/loader/library/impl/
+paper-api/src/main/java/io/papermc/paper/plugin/provider/classloader/
+paper-api/src/main/java/io/papermc/paper/plugin/provider/entrypoint/
+paper-api/src/main/java/io/papermc/paper/plugin/provider/util/
+paper-api/src/main/java/io/papermc/paper/potion/
+paper-api/src/main/java/io/papermc/paper/raytracing/
+paper-api/src/main/java/io/papermc/paper/registry/
+paper-api/src/main/java/io/papermc/paper/registry/data/
+paper-api/src/main/java/io/papermc/paper/registry/data/client/
+paper-api/src/main/java/io/papermc/paper/registry/data/dialog/
+paper-api/src/main/java/io/papermc/paper/registry/data/dialog/action/
+paper-api/src/main/java/io/papermc/paper/registry/data/dialog/body/
+paper-api/src/main/java/io/papermc/paper/registry/data/dialog/input/
+paper-api/src/main/java/io/papermc/paper/registry/data/dialog/type/
+paper-api/src/main/java/io/papermc/paper/registry/event/
+paper-api/src/main/java/io/papermc/paper/registry/event/type/
+paper-api/src/main/java/io/papermc/paper/registry/holder/
+paper-api/src/main/java/io/papermc/paper/registry/set/
+paper-api/src/main/java/io/papermc/paper/registry/tag/
+paper-api/src/main/java/io/papermc/paper/scoreboard/numbers/
+paper-api/src/main/java/io/papermc/paper/tag/
+paper-api/src/main/java/io/papermc/paper/text/
+paper-api/src/main/java/io/papermc/paper/threadedregions/
+paper-api/src/main/java/io/papermc/paper/threadedregions/scheduler/
+paper-api/src/main/java/io/papermc/paper/util/
+paper-api/src/main/java/io/papermc/paper/world/
+paper-api/src/main/java/io/papermc/paper/world/damagesource/
+paper-api/src/main/java/io/papermc/paper/world/flag/
+paper-api/src/main/java/org/bukkit/
+paper-api/src/main/java/org/bukkit/advancement/
+paper-api/src/main/java/org/bukkit/attribute/
+paper-api/src/main/java/org/bukkit/ban/
+paper-api/src/main/java/org/bukkit/block/
+paper-api/src/main/java/org/bukkit/block/banner/
+paper-api/src/main/java/org/bukkit/block/data/
+paper-api/src/main/java/org/bukkit/block/data/type/
+paper-api/src/main/java/org/bukkit/block/sign/
+paper-api/src/main/java/org/bukkit/block/spawner/
+paper-api/src/main/java/org/bukkit/block/structure/
+paper-api/src/main/java/org/bukkit/boss/
+paper-api/src/main/java/org/bukkit/command/
+paper-api/src/main/java/org/bukkit/command/defaults/
+paper-api/src/main/java/org/bukkit/configuration/
+paper-api/src/main/java/org/bukkit/configuration/file/
+paper-api/src/main/java/org/bukkit/configuration/serialization/
+paper-api/src/main/java/org/bukkit/conversations/
+paper-api/src/main/java/org/bukkit/damage/
+paper-api/src/main/java/org/bukkit/enchantments/
+paper-api/src/main/java/org/bukkit/entity/
+paper-api/src/main/java/org/bukkit/entity/boat/
+paper-api/src/main/java/org/bukkit/entity/memory/
+paper-api/src/main/java/org/bukkit/entity/minecart/
+paper-api/src/main/java/org/bukkit/event/
+paper-api/src/main/java/org/bukkit/event/block/
+paper-api/src/main/java/org/bukkit/event/command/
+paper-api/src/main/java/org/bukkit/event/enchantment/
+paper-api/src/main/java/org/bukkit/event/entity/
+paper-api/src/main/java/org/bukkit/event/hanging/
+paper-api/src/main/java/org/bukkit/event/inventory/
+paper-api/src/main/java/org/bukkit/event/player/
+paper-api/src/main/java/org/bukkit/event/raid/
+paper-api/src/main/java/org/bukkit/event/server/
+paper-api/src/main/java/org/bukkit/event/vehicle/
+paper-api/src/main/java/org/bukkit/event/weather/
+paper-api/src/main/java/org/bukkit/event/world/
+paper-api/src/main/java/org/bukkit/generator/
+paper-api/src/main/java/org/bukkit/generator/structure/
+paper-api/src/main/java/org/bukkit/help/
+paper-api/src/main/java/org/bukkit/inventory/
+paper-api/src/main/java/org/bukkit/inventory/meta/
+paper-api/src/main/java/org/bukkit/inventory/meta/components/
+paper-api/src/main/java/org/bukkit/inventory/meta/tags/
+paper-api/src/main/java/org/bukkit/inventory/meta/trim/
+paper-api/src/main/java/org/bukkit/inventory/recipe/
+paper-api/src/main/java/org/bukkit/inventory/view/
+paper-api/src/main/java/org/bukkit/inventory/view/builder/
+paper-api/src/main/java/org/bukkit/loot/
+paper-api/src/main/java/org/bukkit/map/
+paper-api/src/main/java/org/bukkit/material/
+paper-api/src/main/java/org/bukkit/material/types/
+paper-api/src/main/java/org/bukkit/metadata/
+paper-api/src/main/java/org/bukkit/packs/
+paper-api/src/main/java/org/bukkit/permissions/
+paper-api/src/main/java/org/bukkit/persistence/
+paper-api/src/main/java/org/bukkit/plugin/
+paper-api/src/main/java/org/bukkit/plugin/java/
+paper-api/src/main/java/org/bukkit/plugin/messaging/
+paper-api/src/main/java/org/bukkit/potion/
+paper-api/src/main/java/org/bukkit/profile/
+paper-api/src/main/java/org/bukkit/projectiles/
+paper-api/src/main/java/org/bukkit/scheduler/
+paper-api/src/main/java/org/bukkit/scoreboard/
+paper-api/src/main/java/org/bukkit/spawner/
+paper-api/src/main/java/org/bukkit/structure/
+paper-api/src/main/java/org/bukkit/tag/
+paper-api/src/main/java/org/bukkit/util/
+paper-api/src/main/java/org/bukkit/util/io/
+paper-api/src/main/java/org/bukkit/util/noise/
+paper-api/src/main/java/org/bukkit/util/permissions/
+paper-api/src/main/java/org/spigotmc/
+paper-api/src/main/java/org/spigotmc/event/player/
+paper-api/src/test/java/com/destroystokyo/paper/
+paper-api/src/test/java/io/papermc/paper/adventure/
+paper-api/src/test/java/io/papermc/paper/registry/
+paper-api/src/test/java/io/papermc/paper/testing/
+paper-api/src/test/java/io/papermc/paper/util/
+paper-api/src/test/java/org/bukkit/
+paper-api/src/test/java/org/bukkit/configuration/
+paper-api/src/test/java/org/bukkit/configuration/file/
+paper-api/src/test/java/org/bukkit/conversations/
+paper-api/src/test/java/org/bukkit/event/
+paper-api/src/test/java/org/bukkit/materials/
+paper-api/src/test/java/org/bukkit/metadata/
+paper-api/src/test/java/org/bukkit/plugin/
+paper-api/src/test/java/org/bukkit/plugin/messaging/
+paper-api/src/test/java/org/bukkit/scoreboard/
+paper-api/src/test/java/org/bukkit/support/
+paper-api/src/test/java/org/bukkit/support/provider/
+paper-api/src/test/java/org/bukkit/support/test/
+paper-api/src/test/java/org/bukkit/util/
+paper-api/src/test/java/org/bukkit/util/io/

paper-api/build.gradle.kts

@@ -1,7 +1,11 @@
+import io.papermc.paperweight.checkstyle.JavadocTag
+import paper.libs.com.google.gson.Gson
+
 plugins {
     `java-library`
     `maven-publish`
     idea
+    id("io.papermc.paperweight.paper-checkstyle")
 }
 
 java {
@@ -9,14 +13,26 @@ java {
     withJavadocJar()
 }
 
-val annotationsVersion = "26.0.2"
-// Keep in sync with paper-server adventure-text-serializer-ansi dep
-val adventureVersion = "4.21.0"
-val bungeeCordChatVersion = "1.21-R0.2-deprecated+build.21"
-val slf4jVersion = "2.0.16"
-val log4jVersion = "2.24.1"
+val projectCustomJavadocTags = setOf(
+    JavadocTag("apiNote", "a", "API Note:"),
+)
 
-val apiAndDocs: Configuration by configurations.creating {
+paperCheckstyle {
+    customJavadocTags = projectCustomJavadocTags
+    directoriesToSkipFile = layout.projectDirectory.file(".checkstyle/ignored_directories.txt")
+}
+
+val annotationsVersion = "26.1.0"
+val adventureVersion = "5.2.0"
+val bungeeCordChatVersion = "1.21-R0.2-deprecated+build.21"
+val slf4jVersion = "2.0.17"
+val log4jVersion = "2.26.0"
+
+val apiAndDocs: Configuration = configurations.create("apiAndDocs")
+configurations.api {
+    extendsFrom(apiAndDocs)
+}
+val javadocSourcepath: Configuration = configurations.create("javadocSourcepath") {
     attributes {
         attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
         attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling.EXTERNAL))
@@ -24,9 +40,6 @@ val apiAndDocs: Configuration by configurations.creating {
         attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage.JAVA_RUNTIME))
     }
 }
-configurations.api {
-    extendsFrom(apiAndDocs)
-}
 
 // Configure mockito agent that is needed in newer Java versions
 val mockitoAgent = configurations.register("mockitoAgent")
@@ -41,16 +54,14 @@ 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")
+    api("com.google.guava:guava:33.6.0-jre")
+    api("com.google.code.gson:gson:2.14.0")
     api("org.yaml:snakeyaml:2.2")
-    api("org.joml:joml:1.10.8") {
-        isTransitive = false // https://github.com/JOML-CI/JOML/issues/352
-    }
-    api("it.unimi.dsi:fastutil:8.5.15")
+    api("org.joml:joml:1.10.9")
+    api("it.unimi.dsi:fastutil:8.5.18")
     api("org.apache.logging.log4j:log4j-api:$log4jVersion")
     api("org.slf4j:slf4j-api:$slf4jVersion")
-    api("com.mojang:brigadier:1.3.10")
+    api("com.mojang:brigadier:1.3.11")
 
     // Deprecate bungeecord-chat in favor of adventure
     api("net.md-5:bungeecord-chat:$bungeeCordChatVersion") {
@@ -59,6 +70,7 @@ dependencies {
 
     apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion"))
     apiAndDocs("net.kyori:adventure-api")
+    apiAndDocs("net.kyori:adventure-key")
     apiAndDocs("net.kyori:adventure-text-minimessage")
     apiAndDocs("net.kyori:adventure-text-serializer-gson")
     apiAndDocs("net.kyori:adventure-text-serializer-legacy")
@@ -66,28 +78,32 @@ dependencies {
     apiAndDocs("net.kyori:adventure-text-logger-slf4j")
 
     api("org.apache.maven:maven-resolver-provider:3.9.6") // make API dependency for Paper Plugins
-    compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
-    compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
+    implementation("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
+    implementation("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
 
     // Annotations - Slowly migrate to jspecify
     val annotations = "org.jetbrains:annotations:$annotationsVersion"
     compileOnly(annotations)
     testCompileOnly(annotations)
+    javadocSourcepath(annotations) // For adventure-api module requirements
 
-    val checkerQual = "org.checkerframework:checker-qual:3.49.2"
+    val checkerQual = "org.checkerframework:checker-qual:4.2.3"
     compileOnlyApi(checkerQual)
     testCompileOnly(checkerQual)
 
-    api("org.jspecify:jspecify:1.0.0")
+    apiAndDocs("org.jspecify:jspecify:1.0.0")
 
     // Test dependencies
-    testImplementation("org.apache.commons:commons-lang3:3.17.0")
-    testImplementation("org.junit.jupiter:junit-jupiter:5.12.2")
+    testImplementation("org.apache.commons:commons-lang3:3.20.0")
+    testImplementation("org.junit.jupiter:junit-jupiter:6.0.3")
     testImplementation("org.hamcrest:hamcrest:2.2")
-    testImplementation("org.mockito:mockito-core:5.14.1")
-    testImplementation("org.ow2.asm:asm-tree:9.8")
-    mockitoAgent("org.mockito:mockito-core:5.14.1") { isTransitive = false } // configure mockito agent that is needed in newer java versions
-    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+    testImplementation("org.mockito:mockito-core:5.22.0")
+    testImplementation("org.ow2.asm:asm-tree:9.9.1")
+    mockitoAgent("org.mockito:mockito-core:5.22.0") { isTransitive = false } // configure mockito agent that is needed in newer java versions
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher:6.0.3")
+
+    // checkstyle
+    checkstyle(project(":paper-checkstyle"))
 }
 
 val generatedDir: java.nio.file.Path = layout.projectDirectory.dir("src/generated/java").asFile.toPath()
@@ -137,20 +153,36 @@ configure<PublishingExtension> {
     }
 }
 
-val generateApiVersioningFile by tasks.registering {
-    inputs.property("version", project.version)
-    val pomProps = layout.buildDirectory.file("pom.properties")
-    outputs.file(pomProps)
-    val projectVersion = project.version
-    doLast {
-        pomProps.get().asFile.writeText("version=$projectVersion")
+abstract class GenerateApiVersioningFile : DefaultTask() {
+    @get:OutputFile
+    abstract val outputFile: RegularFileProperty
+
+    @get:Input
+    abstract val projectVersion: Property<String>
+
+    @get:Input
+    abstract val apiVersion: Property<String>
+
+    @TaskAction
+    fun generate() {
+        val file = outputFile.get().asFile
+        file.parentFile.mkdirs()
+        val map = mapOf(
+            "version" to projectVersion.get(),
+            "currentApiVersion" to apiVersion.get()
+        )
+        file.writeText(Gson().toJson(map))
     }
 }
 
+val generateApiVersioningFile = tasks.register<GenerateApiVersioningFile>("generateApiVersioningFile") {
+    outputFile.set(layout.buildDirectory.file("apiVersioning.json"))
+    projectVersion.set(project.version.toString())
+    apiVersion.set(rootProject.providers.gradleProperty("apiVersion"))
+}
+
 tasks.jar {
-    from(generateApiVersioningFile.map { it.outputs.files.singleFile }) {
-        into("META-INF/maven/${project.group}/${project.name}")
-    }
+    from(generateApiVersioningFile.flatMap { it.outputFile })
     manifest {
         attributes(
             "Automatic-Module-Name" to "org.bukkit"
@@ -164,37 +196,31 @@ abstract class Services {
 }
 val services = objects.newInstance<Services>()
 
-tasks.withType<Javadoc> {
+tasks.withType<Javadoc>().configureEach {
     val options = options as StandardJavadocDocletOptions
     options.overview = "src/main/javadoc/overview.html"
     options.use()
     options.isDocFilesSubDirs = true
     options.links(
-        "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://www.javadoc.io/doc/com.google.code.gson/gson/2.11.0",
+        "https://guava.dev/releases/33.6.0-jre/api/docs/",
+        "https://www.javadocs.dev/org.yaml/snakeyaml/2.2/",
+        "https://www.javadocs.dev/org.jetbrains/annotations/$annotationsVersion/",
+        "https://www.javadocs.dev/org.joml/joml/1.10.9/",
+        "https://www.javadocs.dev/com.google.code.gson/gson/2.14.0",
         "https://jspecify.dev/docs/api/",
-        "https://jd.advntr.dev/api/$adventureVersion/",
-        "https://jd.advntr.dev/key/$adventureVersion/",
-        "https://jd.advntr.dev/text-minimessage/$adventureVersion/",
-        "https://jd.advntr.dev/text-serializer-gson/$adventureVersion/",
-        "https://jd.advntr.dev/text-serializer-legacy/$adventureVersion/",
-        "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://jd.papermc.io/adventure/$adventureVersion/",
+        "https://www.javadocs.dev/org.slf4j/slf4j-api/$slf4jVersion/",
         "https://logging.apache.org/log4j/2.x/javadoc/log4j-api/",
-        "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.7.3",
+        "https://www.javadocs.dev/org.apache.maven.resolver/maven-resolver-api/1.7.3",
     )
-    options.tags("apiNote:a:API Note:")
+    options.tags(projectCustomJavadocTags.map { it.toOptionString() })
 
-    inputs.files(apiAndDocs).ignoreEmptyDirectories().withPropertyName(apiAndDocs.name + "-configuration")
-    val apiAndDocsElements = apiAndDocs.elements
+    inputs.files(javadocSourcepath).ignoreEmptyDirectories().withPropertyName(javadocSourcepath.name + "-configuration")
+    val javadocSourcepathElements = javadocSourcepath.elements
     doFirst {
         options.addStringOption(
             "sourcepath",
-            apiAndDocsElements.get().map { it.asFile }.joinToString(separator = File.pathSeparator, transform = File::getPath)
+            javadocSourcepathElements.get().map { it.asFile }.joinToString(separator = File.pathSeparator, transform = File::getPath)
         )
     }
 
@@ -225,7 +251,7 @@ tasks.compileTestJava {
     options.compilerArgs.add("-parameters")
 }
 
-val scanJarForBadCalls by tasks.registering(io.papermc.paperweight.tasks.ScanJarForBadCalls::class) {
+val scanJarForBadCalls = tasks.register<io.papermc.paperweight.tasks.ScanJarForBadCalls>("scanJarForBadCalls") {
     badAnnotations.add("Lio/papermc/paper/annotation/DoNotUse;")
     jarToScan.set(tasks.jar.flatMap { it.archiveFile })
     classpath.from(configurations.compileClasspath)
@@ -233,15 +259,3 @@ val scanJarForBadCalls by tasks.registering(io.papermc.paperweight.tasks.ScanJar
 tasks.check {
     dependsOn(scanJarForBadCalls)
 }
-
-if (providers.gradleProperty("updatingMinecraft").getOrElse("false").toBoolean()) {
-    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 })
-        classpath.from(configurations.compileClasspath)
-    }
-    tasks.check {
-        dependsOn(scanJarForOldGeneratedCode)
-    }
-}

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

@@ -1,9 +1,10 @@
 package com.destroystokyo.paper.entity.ai;
 
 import com.destroystokyo.paper.entity.RangedEntity;
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.entity.SchoolableFish;
-import io.papermc.paper.generated.GeneratedFrom;
 import org.bukkit.NamespacedKey;
+import org.bukkit.entity.AbstractCubeMob;
 import org.bukkit.entity.AbstractHorse;
 import org.bukkit.entity.AbstractSkeleton;
 import org.bukkit.entity.AbstractVillager;
@@ -21,6 +22,7 @@ import org.bukkit.entity.Fish;
 import org.bukkit.entity.Fox;
 import org.bukkit.entity.Ghast;
 import org.bukkit.entity.Guardian;
+import org.bukkit.entity.HappyGhast;
 import org.bukkit.entity.Illager;
 import org.bukkit.entity.Illusioner;
 import org.bukkit.entity.IronGolem;
@@ -38,11 +40,11 @@ import org.bukkit.entity.Raider;
 import org.bukkit.entity.Shulker;
 import org.bukkit.entity.Silverfish;
 import org.bukkit.entity.SkeletonHorse;
-import org.bukkit.entity.Slime;
 import org.bukkit.entity.Spellcaster;
 import org.bukkit.entity.Spider;
 import org.bukkit.entity.Squid;
 import org.bukkit.entity.Strider;
+import org.bukkit.entity.SulfurCube;
 import org.bukkit.entity.Tameable;
 import org.bukkit.entity.Turtle;
 import org.bukkit.entity.Vex;
@@ -67,17 +69,27 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedClass
 public interface VanillaGoal<T extends Mob> extends Goal<T> {
-    GoalKey<AbstractHorse> RANDOM_STAND = create("random_stand", AbstractHorse.class);
+    GoalKey<AbstractCubeMob> CUBE_MOB_ATTACK = create("cube_mob_attack", AbstractCubeMob.class);
 
-    GoalKey<AbstractHorse> RUN_AROUND_LIKE_CRAZY = create("run_around_like_crazy", AbstractHorse.class);
+    GoalKey<AbstractCubeMob> CUBE_MOB_FLOAT = create("cube_mob_float", AbstractCubeMob.class);
 
-    GoalKey<AbstractSkeleton> ABSTRACT_SKELETON_MELEE = create("abstract_skeleton_melee", AbstractSkeleton.class);
+    GoalKey<AbstractCubeMob> CUBE_MOB_KEEP_ON_JUMPING = create("cube_mob_keep_on_jumping", AbstractCubeMob.class);
 
-    GoalKey<AbstractVillager> LOOK_AT_TRADING_PLAYER = create("look_at_trading_player", AbstractVillager.class);
+    GoalKey<AbstractCubeMob> CUBE_MOB_RANDOM_DIRECTION = create("cube_mob_random_direction", AbstractCubeMob.class);
 
-    GoalKey<AbstractVillager> TRADE_WITH_PLAYER = create("trade_with_player", AbstractVillager.class);
+    GoalKey<AbstractHorse> HORSE_MOUNT_PANIC = create("horse_mount_panic", AbstractHorse.class);
+
+    GoalKey<AbstractHorse> HORSE_RANDOM_STAND = create("horse_random_stand", AbstractHorse.class);
+
+    GoalKey<AbstractHorse> HORSE_RUN_AROUND_LIKE_CRAZY = create("horse_run_around_like_crazy", AbstractHorse.class);
+
+    GoalKey<AbstractSkeleton> SKELETON_MELEE = create("skeleton_melee", AbstractSkeleton.class);
+
+    GoalKey<AbstractVillager> VILLAGER_LOOK_AT_TRADING_PLAYER = create("villager_look_at_trading_player", AbstractVillager.class);
+
+    GoalKey<AbstractVillager> VILLAGER_TRADE_WITH_PLAYER = create("villager_trade_with_player", AbstractVillager.class);
 
     GoalKey<Animals> BREED = create("breed", Animals.class);
 
@@ -101,17 +113,17 @@ 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);
 
-    GoalKey<Cat> CAT_LIE_ON_BED = create("cat_lie_on_bed", Cat.class);
+    GoalKey<Cat> CAT_LIE_ON_BLOCK = create("cat_lie_on_block", Cat.class);
 
     GoalKey<Cat> CAT_RELAX_ON_OWNER = create("cat_relax_on_owner", Cat.class);
 
@@ -127,7 +139,7 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
 
     GoalKey<Creature> FLEE_SUN = create("flee_sun", Creature.class);
 
-    GoalKey<Creature> FOLLOW_BOAT = create("follow_boat", Creature.class);
+    GoalKey<Creature> FOLLOW_PLAYER_RIDDEN_ENTITY = create("follow_player_ridden_entity", Creature.class);
 
     GoalKey<Creature> GOLEM_RANDOM_STROLL_IN_VILLAGE = create("golem_random_stroll_in_village", Creature.class);
 
@@ -159,22 +171,24 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
 
     GoalKey<Creature> TEMPT = create("tempt", Creature.class);
 
-    GoalKey<Creature> TRY_FIND_WATER = create("try_find_water", Creature.class);
+    GoalKey<Creature> TRY_FIND_LIQUID = create("try_find_liquid", Creature.class);
 
     GoalKey<Creature> WATER_AVOIDING_RANDOM_FLYING = create("water_avoiding_random_flying", Creature.class);
 
     GoalKey<Creature> WATER_AVOIDING_RANDOM_STROLL = create("water_avoiding_random_stroll", Creature.class);
 
-    GoalKey<Creeper> SWELL = create("swell", Creeper.class);
+    GoalKey<Creeper> CREEPER_SWELL = create("creeper_swell", Creeper.class);
 
     GoalKey<Dolphin> DOLPHIN_JUMP = create("dolphin_jump", Dolphin.class);
 
+    GoalKey<Dolphin> DOLPHIN_MOVE_TO_ITEM = create("dolphin_move_to_item", Dolphin.class);
+
+    GoalKey<Dolphin> DOLPHIN_PLAY_WITH_ITEMS = create("dolphin_play_with_items", Dolphin.class);
+
     GoalKey<Dolphin> DOLPHIN_SWIM_TO_TREASURE = create("dolphin_swim_to_treasure", Dolphin.class);
 
     GoalKey<Dolphin> DOLPHIN_SWIM_WITH_PLAYER = create("dolphin_swim_with_player", Dolphin.class);
 
-    GoalKey<Dolphin> PLAY_WITH_ITEMS = create("play_with_items", Dolphin.class);
-
     GoalKey<Drowned> DROWNED_ATTACK = create("drowned_attack", Drowned.class);
 
     GoalKey<Drowned> DROWNED_GO_TO_BEACH = create("drowned_go_to_beach", Drowned.class);
@@ -199,14 +213,14 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
 
     GoalKey<Fish> FISH_SWIM = create("fish_swim", Fish.class);
 
-    GoalKey<Fox> DEFEND_TRUSTED = create("defend_trusted", Fox.class);
-
-    GoalKey<Fox> FACEPLANT = create("faceplant", Fox.class);
-
     GoalKey<Fox> FOX_BREED = create("fox_breed", Fox.class);
 
+    GoalKey<Fox> FOX_DEFEND_TRUSTED = create("fox_defend_trusted", Fox.class);
+
     GoalKey<Fox> FOX_EAT_BERRIES = create("fox_eat_berries", Fox.class);
 
+    GoalKey<Fox> FOX_FACEPLANT = create("fox_faceplant", Fox.class);
+
     GoalKey<Fox> FOX_FLOAT = create("fox_float", Fox.class);
 
     GoalKey<Fox> FOX_FOLLOW_PARENT = create("fox_follow_parent", Fox.class);
@@ -217,29 +231,27 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
 
     GoalKey<Fox> FOX_PANIC = create("fox_panic", Fox.class);
 
+    GoalKey<Fox> FOX_PERCH_AND_SEARCH = create("fox_perch_and_search", Fox.class);
+
     GoalKey<Fox> FOX_POUNCE = create("fox_pounce", Fox.class);
 
     GoalKey<Fox> FOX_SEARCH_FOR_ITEMS = create("fox_search_for_items", Fox.class);
 
+    GoalKey<Fox> FOX_SEEK_SHELTER = create("fox_seek_shelter", Fox.class);
+
+    GoalKey<Fox> FOX_SLEEP = create("fox_sleep", Fox.class);
+
+    GoalKey<Fox> FOX_STALK_PREY = create("fox_stalk_prey", Fox.class);
+
     GoalKey<Fox> FOX_STROLL_THROUGH_VILLAGE = create("fox_stroll_through_village", Fox.class);
 
-    GoalKey<Fox> PERCH_AND_SEARCH = create("perch_and_search", Fox.class);
-
-    GoalKey<Fox> SEEK_SHELTER = create("seek_shelter", Fox.class);
-
-    GoalKey<Fox> SLEEP = create("sleep", Fox.class);
-
-    GoalKey<Fox> STALK_PREY = create("stalk_prey", Fox.class);
-
-    GoalKey<Ghast> GHAST_LOOK = create("ghast_look", Ghast.class);
-
     GoalKey<Ghast> GHAST_SHOOT_FIREBALL = create("ghast_shoot_fireball", Ghast.class);
 
-    GoalKey<Ghast> RANDOM_FLOAT_AROUND = create("random_float_around", Ghast.class);
-
     GoalKey<Guardian> GUARDIAN_ATTACK = create("guardian_attack", Guardian.class);
 
-    GoalKey<Illager> HOLD_GROUND_ATTACK = create("hold_ground_attack", Illager.class);
+    GoalKey<HappyGhast> HAPPY_GHAST_FLOAT = create("happy_ghast_float", HappyGhast.class);
+
+    GoalKey<Illager> ILLAGER_HOLD_GROUND_ATTACK = create("illager_hold_ground_attack", Illager.class);
 
     GoalKey<Illager> RAIDER_OPEN_DOOR = create("raider_open_door", Illager.class);
 
@@ -247,9 +259,9 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
 
     GoalKey<Illusioner> ILLUSIONER_MIRROR_SPELL = create("illusioner_mirror_spell", Illusioner.class);
 
-    GoalKey<IronGolem> DEFEND_VILLAGE = create("defend_village", IronGolem.class);
+    GoalKey<IronGolem> IRON_GOLEM_DEFEND_VILLAGE = create("iron_golem_defend_village", IronGolem.class);
 
-    GoalKey<IronGolem> OFFER_FLOWER = create("offer_flower", IronGolem.class);
+    GoalKey<IronGolem> IRON_GOLEM_OFFER_FLOWER = create("iron_golem_offer_flower", IronGolem.class);
 
     GoalKey<Llama> LLAMA_ATTACK_WOLF = create("llama_attack_wolf", Llama.class);
 
@@ -269,6 +281,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
 
     GoalKey<Mob> FOLLOW_MOB = create("follow_mob", Mob.class);
 
+    GoalKey<Mob> GHAST_LOOK = create("ghast_look", Mob.class);
+
     GoalKey<Mob> INTERACT = create("interact", Mob.class);
 
     GoalKey<Mob> LEAP_AT = create("leap_at", Mob.class);
@@ -281,10 +295,16 @@ 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> SULFUR_CUBE_TEMPT = create("sulfur_cube_tempt", 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);
@@ -293,6 +313,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
 
     GoalKey<Monster> RANGED_CROSSBOW_ATTACK = create("ranged_crossbow_attack", Monster.class);
 
+    GoalKey<Monster> SPEAR_USE = create("spear_use", Monster.class);
+
     GoalKey<Ocelot> OCELOT_AVOID_ENTITY = create("ocelot_avoid_entity", Ocelot.class);
 
     GoalKey<Ocelot> OCELOT_TEMPT = create("ocelot_tempt", Ocelot.class);
@@ -317,7 +339,7 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
 
     GoalKey<Panda> PANDA_SNEEZE = create("panda_sneeze", Panda.class);
 
-    GoalKey<Parrot> LAND_ON_OWNERS_SHOULDER = create("land_on_owners_shoulder", Parrot.class);
+    GoalKey<Parrot> PARROT_LAND_ON_OWNERS_SHOULDER = create("parrot_land_on_owners_shoulder", Parrot.class);
 
     GoalKey<Phantom> PHANTOM_ATTACK_PLAYER = create("phantom_attack_player", Phantom.class);
 
@@ -339,27 +361,27 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
 
     GoalKey<Rabbit> RABBIT_PANIC = create("rabbit_panic", Rabbit.class);
 
-    GoalKey<Rabbit> RAID_GARDEN = create("raid_garden", Rabbit.class);
-
-    GoalKey<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<Rabbit> RABBIT_RAID_GARDEN = create("rabbit_raid_garden", Rabbit.class);
 
     GoalKey<Raider> RAIDER_CELEBRATION = create("raider_celebration", Raider.class);
 
+    GoalKey<Raider> RAIDER_LONG_DISTANCE_PATROL = create("raider_long_distance_patrol", Raider.class);
+
     GoalKey<Raider> RAIDER_MOVE_THROUGH_VILLAGE = create("raider_move_through_village", Raider.class);
 
+    GoalKey<Raider> RAIDER_NEAREST_ATTACKABLE_WITCH = create("raider_nearest_attackable_witch", Raider.class);
+
+    GoalKey<Raider> RAIDER_NEAREST_HEALABLE_RAIDER = create("raider_nearest_healable_raider", Raider.class);
+
+    GoalKey<Raider> RAIDER_OBTAIN_RAID_LEADER_BANNER = create("raider_obtain_raid_leader_banner", Raider.class);
+
+    GoalKey<Raider> RAIDER_PATHFIND_TO_RAID = create("raider_pathfind_to_raid", Raider.class);
+
     GoalKey<RangedEntity> DROWNED_TRIDENT_ATTACK = create("drowned_trident_attack", RangedEntity.class);
 
     GoalKey<RangedEntity> RANGED_ATTACK = create("ranged_attack", RangedEntity.class);
 
-    GoalKey<SchoolableFish> FOLLOW_FLOCK_LEADER = create("follow_flock_leader", SchoolableFish.class);
+    GoalKey<SchoolableFish> SCHOOLABLE_FISH_FOLLOW_FLOCK_LEADER = create("schoolable_fish_follow_flock_leader", SchoolableFish.class);
 
     GoalKey<Shulker> SHULKER_ATTACK = create("shulker_attack", Shulker.class);
 
@@ -373,15 +395,7 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
 
     GoalKey<Silverfish> SILVERFISH_WAKE_UP_FRIENDS = create("silverfish_wake_up_friends", Silverfish.class);
 
-    GoalKey<SkeletonHorse> SKELETON_TRAP = create("skeleton_trap", SkeletonHorse.class);
-
-    GoalKey<Slime> SLIME_ATTACK = create("slime_attack", Slime.class);
-
-    GoalKey<Slime> SLIME_FLOAT = create("slime_float", Slime.class);
-
-    GoalKey<Slime> SLIME_KEEP_ON_JUMPING = create("slime_keep_on_jumping", Slime.class);
-
-    GoalKey<Slime> SLIME_RANDOM_DIRECTION = create("slime_random_direction", Slime.class);
+    GoalKey<SkeletonHorse> SKELETON_HORSE_SKELETON_TRAP = create("skeleton_horse_skeleton_trap", SkeletonHorse.class);
 
     GoalKey<Spellcaster> SPELLCASTER_CASTING_SPELL = create("spellcaster_casting_spell", Spellcaster.class);
 
@@ -395,6 +409,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
 
     GoalKey<Strider> STRIDER_GO_TO_LAVA = create("strider_go_to_lava", Strider.class);
 
+    GoalKey<SulfurCube> SULFUR_CUBE_SEARCH_FOR_ITEMS = create("sulfur_cube_search_for_items", SulfurCube.class);
+
     GoalKey<Tameable> FOLLOW_OWNER = create("follow_owner", Tameable.class);
 
     GoalKey<Tameable> NON_TAME_RANDOM = create("non_tame_random", Tameable.class);
@@ -429,14 +445,14 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
 
     GoalKey<Vindicator> VINDICATOR_JOHNNY_ATTACK = create("vindicator_johnny_attack", Vindicator.class);
 
-    GoalKey<WanderingTrader> WANDER_TO_POSITION = create("wander_to_position", WanderingTrader.class);
+    GoalKey<WanderingTrader> WANDERING_TRADER_WANDER_TO_POSITION = create("wandering_trader_wander_to_position", WanderingTrader.class);
 
     GoalKey<Wither> WITHER_DO_NOTHING = create("wither_do_nothing", Wither.class);
 
-    GoalKey<Wolf> BEG = create("beg", Wolf.class);
-
     GoalKey<Wolf> WOLF_AVOID_ENTITY = create("wolf_avoid_entity", Wolf.class);
 
+    GoalKey<Wolf> WOLF_BEG = create("wolf_beg", Wolf.class);
+
     GoalKey<Zombie> ZOMBIE_ATTACK = create("zombie_attack", Zombie.class);
 
     GoalKey<Zombie> ZOMBIE_ATTACK_TURTLE_EGG = create("zombie_attack_turtle_egg", Zombie.class);

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

@@ -2,7 +2,7 @@ package io.papermc.paper.registry.keys;
 
 import static net.kyori.adventure.key.Key.key;
 
-import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
@@ -23,8 +23,15 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedClass
 public final class AttributeKeys {
+    /**
+     * {@code minecraft:air_drag_modifier}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> AIR_DRAG_MODIFIER = create(key("air_drag_modifier"));
+
     /**
      * {@code minecraft:armor}
      *
@@ -60,6 +67,13 @@ public final class AttributeKeys {
      */
     public static final TypedKey<Attribute> ATTACK_SPEED = create(key("attack_speed"));
 
+    /**
+     * {@code minecraft:below_name_distance}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> BELOW_NAME_DISTANCE = create(key("below_name_distance"));
+
     /**
      * {@code minecraft:block_break_speed}
      *
@@ -74,6 +88,13 @@ public final class AttributeKeys {
      */
     public static final TypedKey<Attribute> BLOCK_INTERACTION_RANGE = create(key("block_interaction_range"));
 
+    /**
+     * {@code minecraft:bounciness}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> BOUNCINESS = create(key("bounciness"));
+
     /**
      * {@code minecraft:burning_time}
      *
@@ -81,6 +102,13 @@ public final class AttributeKeys {
      */
     public static final TypedKey<Attribute> BURNING_TIME = create(key("burning_time"));
 
+    /**
+     * {@code minecraft:camera_distance}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> CAMERA_DISTANCE = create(key("camera_distance"));
+
     /**
      * {@code minecraft:entity_interaction_range}
      *
@@ -116,6 +144,13 @@ public final class AttributeKeys {
      */
     public static final TypedKey<Attribute> FOLLOW_RANGE = create(key("follow_range"));
 
+    /**
+     * {@code minecraft:friction_modifier}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> FRICTION_MODIFIER = create(key("friction_modifier"));
+
     /**
      * {@code minecraft:gravity}
      *
@@ -179,6 +214,13 @@ public final class AttributeKeys {
      */
     public static final TypedKey<Attribute> MOVEMENT_SPEED = create(key("movement_speed"));
 
+    /**
+     * {@code minecraft:name_tag_distance}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> NAME_TAG_DISTANCE = create(key("name_tag_distance"));
+
     /**
      * {@code minecraft:oxygen_bonus}
      *
@@ -249,6 +291,20 @@ public final class AttributeKeys {
      */
     public static final TypedKey<Attribute> WATER_MOVEMENT_EFFICIENCY = create(key("water_movement_efficiency"));
 
+    /**
+     * {@code minecraft:waypoint_receive_range}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> WAYPOINT_RECEIVE_RANGE = create(key("waypoint_receive_range"));
+
+    /**
+     * {@code minecraft:waypoint_transmit_range}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Attribute> WAYPOINT_TRANSMIT_RANGE = create(key("waypoint_transmit_range"));
+
     private AttributeKeys() {
     }
 

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

@@ -2,7 +2,7 @@ package io.papermc.paper.registry.keys;
 
 import static net.kyori.adventure.key.Key.key;
 
-import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedClass
 public final class BannerPatternKeys {
     /**
      * {@code minecraft:base}

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

@@ -2,7 +2,7 @@ package io.papermc.paper.registry.keys;
 
 import static net.kyori.adventure.key.Key.key;
 
-import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedClass
 public final class BiomeKeys {
     /**
      * {@code minecraft:badlands}
@@ -81,6 +81,13 @@ public final class BiomeKeys {
      */
     public static final TypedKey<Biome> CRIMSON_FOREST = create(key("crimson_forest"));
 
+    /**
+     * {@code minecraft:dappled_forest}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Biome> DAPPLED_FOREST = create(key("dappled_forest"));
+
     /**
      * {@code minecraft:dark_forest}
      *
@@ -396,6 +403,13 @@ public final class BiomeKeys {
      */
     public static final TypedKey<Biome> STONY_SHORE = create(key("stony_shore"));
 
+    /**
+     * {@code minecraft:sulfur_caves}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Biome> SULFUR_CAVES = create(key("sulfur_caves"));
+
     /**
      * {@code minecraft:sunflower_plains}
      *

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

@@ -0,0 +1,54 @@
+package io.papermc.paper.registry.keys;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.annotation.GeneratedClass;
+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.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#CAT_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
+@GeneratedClass
+public final class CatSoundVariantKeys {
+    /**
+     * {@code minecraft:classic}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Cat.SoundVariant> CLASSIC = create(key("classic"));
+
+    /**
+     * {@code minecraft:royal}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Cat.SoundVariant> ROYAL = create(key("royal"));
+
+    private CatSoundVariantKeys() {
+    }
+
+    /**
+     * Creates a typed key for {@link Cat.SoundVariant} in the registry {@code minecraft:cat_sound_variant}.
+     *
+     * @param key the value's key in the registry
+     * @return a new typed key
+     */
+    public static TypedKey<Cat.SoundVariant> create(final Key key) {
+        return TypedKey.create(RegistryKey.CAT_SOUND_VARIANT, key);
+    }
+}

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

@@ -2,7 +2,7 @@ package io.papermc.paper.registry.keys;
 
 import static net.kyori.adventure.key.Key.key;
 
-import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedClass
 public final class CatVariantKeys {
     /**
      * {@code minecraft:all_black}

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

@@ -0,0 +1,54 @@
+package io.papermc.paper.registry.keys;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.annotation.GeneratedClass;
+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_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
+@GeneratedClass
+public final class ChickenSoundVariantKeys {
+    /**
+     * {@code minecraft:classic}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Chicken.SoundVariant> CLASSIC = create(key("classic"));
+
+    /**
+     * {@code minecraft:picky}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Chicken.SoundVariant> PICKY = create(key("picky"));
+
+    private ChickenSoundVariantKeys() {
+    }
+
+    /**
+     * Creates a typed key for {@link Chicken.SoundVariant} in the registry {@code minecraft:chicken_sound_variant}.
+     *
+     * @param key the value's key in the registry
+     * @return a new typed key
+     */
+    public static TypedKey<Chicken.SoundVariant> create(final Key key) {
+        return TypedKey.create(RegistryKey.CHICKEN_SOUND_VARIANT, key);
+    }
+}

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

@@ -2,7 +2,7 @@ package io.papermc.paper.registry.keys;
 
 import static net.kyori.adventure.key.Key.key;
 
-import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedClass
 public final class ChickenVariantKeys {
     /**
      * {@code minecraft:cold}

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

@@ -0,0 +1,54 @@
+package io.papermc.paper.registry.keys;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.annotation.GeneratedClass;
+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_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
+@GeneratedClass
+public final class CowSoundVariantKeys {
+    /**
+     * {@code minecraft:classic}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Cow.SoundVariant> CLASSIC = create(key("classic"));
+
+    /**
+     * {@code minecraft:moody}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Cow.SoundVariant> MOODY = create(key("moody"));
+
+    private CowSoundVariantKeys() {
+    }
+
+    /**
+     * Creates a typed key for {@link Cow.SoundVariant} in the registry {@code minecraft:cow_sound_variant}.
+     *
+     * @param key the value's key in the registry
+     * @return a new typed key
+     */
+    public static TypedKey<Cow.SoundVariant> create(final Key key) {
+        return TypedKey.create(RegistryKey.COW_SOUND_VARIANT, key);
+    }
+}

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

@@ -2,7 +2,7 @@ package io.papermc.paper.registry.keys;
 
 import static net.kyori.adventure.key.Key.key;
 
-import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedClass
 public final class CowVariantKeys {
     /**
      * {@code minecraft:cold}

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

@@ -2,7 +2,7 @@ package io.papermc.paper.registry.keys;
 
 import static net.kyori.adventure.key.Key.key;
 
-import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedClass
 public final class DamageTypeKeys {
     /**
      * {@code minecraft:arrow}
@@ -284,6 +284,13 @@ public final class DamageTypeKeys {
      */
     public static final TypedKey<DamageType> SONIC_BOOM = create(key("sonic_boom"));
 
+    /**
+     * {@code minecraft:spear}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> SPEAR = create(key("spear"));
+
     /**
      * {@code minecraft:spit}
      *
@@ -312,6 +319,13 @@ public final class DamageTypeKeys {
      */
     public static final TypedKey<DamageType> STING = create(key("sting"));
 
+    /**
+     * {@code minecraft:sulfur_cube_hot}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DamageType> SULFUR_CUBE_HOT = create(key("sulfur_cube_hot"));
+
     /**
      * {@code minecraft:sweet_berry_bush}
      *

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

@@ -2,8 +2,8 @@ package io.papermc.paper.registry.keys;
 
 import static net.kyori.adventure.key.Key.key;
 
+import io.papermc.paper.annotation.GeneratedClass;
 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;
@@ -23,8 +23,29 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedClass
 public final class DataComponentTypeKeys {
+    /**
+     * {@code minecraft:additional_trade_cost}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> ADDITIONAL_TRADE_COST = create(key("additional_trade_cost"));
+
+    /**
+     * {@code minecraft:attack_animation}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> ATTACK_ANIMATION = create(key("attack_animation"));
+
+    /**
+     * {@code minecraft:attack_range}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> ATTACK_RANGE = create(key("attack_range"));
+
     /**
      * {@code minecraft:attribute_modifiers}
      *
@@ -74,6 +95,13 @@ public final class DataComponentTypeKeys {
      */
     public static final TypedKey<DataComponentType> BLOCK_STATE = create(key("block_state"));
 
+    /**
+     * {@code minecraft:block_transformer}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> BLOCK_TRANSFORMER = create(key("block_transformer"));
+
     /**
      * {@code minecraft:blocks_attacks}
      *
@@ -88,6 +116,13 @@ public final class DataComponentTypeKeys {
      */
     public static final TypedKey<DataComponentType> BREAK_SOUND = create(key("break_sound"));
 
+    /**
+     * {@code minecraft:brewing_fuel}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> BREWING_FUEL = create(key("brewing_fuel"));
+
     /**
      * {@code minecraft:bucket_entity_data}
      *
@@ -123,6 +158,13 @@ public final class DataComponentTypeKeys {
      */
     public static final TypedKey<DataComponentType> CAT_COLLAR = create(key("cat/collar"));
 
+    /**
+     * {@code minecraft:cat/sound_variant}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> CAT_SOUND_VARIANT = create(key("cat/sound_variant"));
+
     /**
      * {@code minecraft:cat/variant}
      *
@@ -137,6 +179,13 @@ public final class DataComponentTypeKeys {
      */
     public static final TypedKey<DataComponentType> CHARGED_PROJECTILES = create(key("charged_projectiles"));
 
+    /**
+     * {@code minecraft:chicken/sound_variant}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> CHICKEN_SOUND_VARIANT = create(key("chicken/sound_variant"));
+
     /**
      * {@code minecraft:chicken/variant}
      *
@@ -144,6 +193,13 @@ public final class DataComponentTypeKeys {
      */
     public static final TypedKey<DataComponentType> CHICKEN_VARIANT = create(key("chicken/variant"));
 
+    /**
+     * {@code minecraft:compostable}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> COMPOSTABLE = create(key("compostable"));
+
     /**
      * {@code minecraft:consumable}
      *
@@ -165,6 +221,20 @@ public final class DataComponentTypeKeys {
      */
     public static final TypedKey<DataComponentType> CONTAINER_LOOT = create(key("container_loot"));
 
+    /**
+     * {@code minecraft:cooking_fuel}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> COOKING_FUEL = create(key("cooking_fuel"));
+
+    /**
+     * {@code minecraft:cow/sound_variant}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> COW_SOUND_VARIANT = create(key("cow/sound_variant"));
+
     /**
      * {@code minecraft:cow/variant}
      *
@@ -179,6 +249,13 @@ public final class DataComponentTypeKeys {
      */
     public static final TypedKey<DataComponentType> CREATIVE_SLOT_LOCK = create(key("creative_slot_lock"));
 
+    /**
+     * {@code minecraft:cushion/color}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> CUSHION_COLOR = create(key("cushion/color"));
+
     /**
      * {@code minecraft:custom_data}
      *
@@ -214,6 +291,13 @@ public final class DataComponentTypeKeys {
      */
     public static final TypedKey<DataComponentType> DAMAGE_RESISTANT = create(key("damage_resistant"));
 
+    /**
+     * {@code minecraft:damage_type}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> DAMAGE_TYPE = create(key("damage_type"));
+
     /**
      * {@code minecraft:death_protection}
      *
@@ -228,6 +312,13 @@ public final class DataComponentTypeKeys {
      */
     public static final TypedKey<DataComponentType> DEBUG_STICK_STATE = create(key("debug_stick_state"));
 
+    /**
+     * {@code minecraft:dye}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> DYE = create(key("dye"));
+
     /**
      * {@code minecraft:dyed_color}
      *
@@ -333,6 +424,13 @@ public final class DataComponentTypeKeys {
      */
     public static final TypedKey<DataComponentType> INTANGIBLE_PROJECTILE = create(key("intangible_projectile"));
 
+    /**
+     * {@code minecraft:interact_animation}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> INTERACT_ANIMATION = create(key("interact_animation"));
+
     /**
      * {@code minecraft:item_model}
      *
@@ -354,6 +452,13 @@ public final class DataComponentTypeKeys {
      */
     public static final TypedKey<DataComponentType> JUKEBOX_PLAYABLE = create(key("jukebox_playable"));
 
+    /**
+     * {@code minecraft:kinetic_weapon}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> KINETIC_WEAPON = create(key("kinetic_weapon"));
+
     /**
      * {@code minecraft:llama/variant}
      *
@@ -382,13 +487,6 @@ public final class DataComponentTypeKeys {
      */
     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}
      *
@@ -424,6 +522,20 @@ public final class DataComponentTypeKeys {
      */
     public static final TypedKey<DataComponentType> MAX_STACK_SIZE = create(key("max_stack_size"));
 
+    /**
+     * {@code minecraft:minimum_attack_charge}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> MINIMUM_ATTACK_CHARGE = create(key("minimum_attack_charge"));
+
+    /**
+     * {@code minecraft:mob_visibility}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> MOB_VISIBILITY = create(key("mob_visibility"));
+
     /**
      * {@code minecraft:mooshroom/variant}
      *
@@ -459,6 +571,20 @@ public final class DataComponentTypeKeys {
      */
     public static final TypedKey<DataComponentType> PARROT_VARIANT = create(key("parrot/variant"));
 
+    /**
+     * {@code minecraft:piercing_weapon}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> PIERCING_WEAPON = create(key("piercing_weapon"));
+
+    /**
+     * {@code minecraft:pig/sound_variant}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> PIG_SOUND_VARIANT = create(key("pig/sound_variant"));
+
     /**
      * {@code minecraft:pig/variant}
      *
@@ -501,6 +627,13 @@ public final class DataComponentTypeKeys {
      */
     public static final TypedKey<DataComponentType> PROVIDES_BANNER_PATTERNS = create(key("provides_banner_patterns"));
 
+    /**
+     * {@code minecraft:provides_pottery_pattern}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> PROVIDES_POTTERY_PATTERN = create(key("provides_pottery_pattern"));
+
     /**
      * {@code minecraft:provides_trim_material}
      *
@@ -564,6 +697,20 @@ public final class DataComponentTypeKeys {
      */
     public static final TypedKey<DataComponentType> SHULKER_COLOR = create(key("shulker/color"));
 
+    /**
+     * {@code minecraft:sign_text_back}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> SIGN_TEXT_BACK = create(key("sign_text_back"));
+
+    /**
+     * {@code minecraft:sign_text_front}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> SIGN_TEXT_FRONT = create(key("sign_text_front"));
+
     /**
      * {@code minecraft:stored_enchantments}
      *
@@ -571,6 +718,13 @@ public final class DataComponentTypeKeys {
      */
     public static final TypedKey<DataComponentType> STORED_ENCHANTMENTS = create(key("stored_enchantments"));
 
+    /**
+     * {@code minecraft:sulfur_cube_content}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> SULFUR_CUBE_CONTENT = create(key("sulfur_cube_content"));
+
     /**
      * {@code minecraft:suspicious_stew_effects}
      *
@@ -641,6 +795,13 @@ public final class DataComponentTypeKeys {
      */
     public static final TypedKey<DataComponentType> USE_COOLDOWN = create(key("use_cooldown"));
 
+    /**
+     * {@code minecraft:use_effects}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> USE_EFFECTS = create(key("use_effects"));
+
     /**
      * {@code minecraft:use_remainder}
      *
@@ -655,6 +816,20 @@ public final class DataComponentTypeKeys {
      */
     public static final TypedKey<DataComponentType> VILLAGER_VARIANT = create(key("villager/variant"));
 
+    /**
+     * {@code minecraft:villager_food}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> VILLAGER_FOOD = create(key("villager_food"));
+
+    /**
+     * {@code minecraft:waxed}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> WAXED = create(key("waxed"));
+
     /**
      * {@code minecraft:weapon}
      *
@@ -697,6 +872,13 @@ public final class DataComponentTypeKeys {
      */
     public static final TypedKey<DataComponentType> WRITTEN_BOOK_CONTENT = create(key("written_book_content"));
 
+    /**
+     * {@code minecraft:zombie_nautilus/variant}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<DataComponentType> ZOMBIE_NAUTILUS_VARIANT = create(key("zombie_nautilus/variant"));
+
     private DataComponentTypeKeys() {
     }
 

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

@@ -0,0 +1,201 @@
+package io.papermc.paper.registry.keys;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.annotation.GeneratedClass;
+import io.papermc.paper.block.pot.PotPatternType;
+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#DECORATED_POT_PATTERN}.
+ *
+ * @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
+@GeneratedClass
+public final class DecoratedPotPatternKeys {
+    /**
+     * {@code minecraft:angler}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotPatternType> ANGLER = create(key("angler"));
+
+    /**
+     * {@code minecraft:archer}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotPatternType> ARCHER = create(key("archer"));
+
+    /**
+     * {@code minecraft:arms_up}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotPatternType> ARMS_UP = create(key("arms_up"));
+
+    /**
+     * {@code minecraft:blade}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotPatternType> BLADE = create(key("blade"));
+
+    /**
+     * {@code minecraft:brewer}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotPatternType> BREWER = create(key("brewer"));
+
+    /**
+     * {@code minecraft:burn}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotPatternType> BURN = create(key("burn"));
+
+    /**
+     * {@code minecraft:danger}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotPatternType> DANGER = create(key("danger"));
+
+    /**
+     * {@code minecraft:explorer}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotPatternType> EXPLORER = create(key("explorer"));
+
+    /**
+     * {@code minecraft:flow}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotPatternType> FLOW = create(key("flow"));
+
+    /**
+     * {@code minecraft:friend}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotPatternType> FRIEND = create(key("friend"));
+
+    /**
+     * {@code minecraft:guster}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotPatternType> GUSTER = create(key("guster"));
+
+    /**
+     * {@code minecraft:heart}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotPatternType> HEART = create(key("heart"));
+
+    /**
+     * {@code minecraft:heartbreak}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotPatternType> HEARTBREAK = create(key("heartbreak"));
+
+    /**
+     * {@code minecraft:howl}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotPatternType> HOWL = create(key("howl"));
+
+    /**
+     * {@code minecraft:miner}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotPatternType> MINER = create(key("miner"));
+
+    /**
+     * {@code minecraft:mourner}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotPatternType> MOURNER = create(key("mourner"));
+
+    /**
+     * {@code minecraft:plenty}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotPatternType> PLENTY = create(key("plenty"));
+
+    /**
+     * {@code minecraft:prize}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotPatternType> PRIZE = create(key("prize"));
+
+    /**
+     * {@code minecraft:scrape}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotPatternType> SCRAPE = create(key("scrape"));
+
+    /**
+     * {@code minecraft:sheaf}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotPatternType> SHEAF = create(key("sheaf"));
+
+    /**
+     * {@code minecraft:shelter}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotPatternType> SHELTER = create(key("shelter"));
+
+    /**
+     * {@code minecraft:skull}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotPatternType> SKULL = create(key("skull"));
+
+    /**
+     * {@code minecraft:snort}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotPatternType> SNORT = create(key("snort"));
+
+    private DecoratedPotPatternKeys() {
+    }
+
+    /**
+     * Creates a typed key for {@link PotPatternType} in the registry {@code minecraft:decorated_pot_pattern}.
+     *
+     * @param key the value's key in the registry
+     * @return a new typed key
+     */
+    public static TypedKey<PotPatternType> create(final Key key) {
+        return TypedKey.create(RegistryKey.DECORATED_POT_PATTERN, key);
+    }
+}

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

@@ -0,0 +1,61 @@
+package io.papermc.paper.registry.keys;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.annotation.GeneratedClass;
+import io.papermc.paper.dialog.Dialog;
+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#DIALOG}.
+ *
+ * @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
+@GeneratedClass
+public final class DialogKeys {
+    /**
+     * {@code minecraft:custom_options}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Dialog> CUSTOM_OPTIONS = create(key("custom_options"));
+
+    /**
+     * {@code minecraft:quick_actions}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Dialog> QUICK_ACTIONS = create(key("quick_actions"));
+
+    /**
+     * {@code minecraft:server_links}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Dialog> SERVER_LINKS = create(key("server_links"));
+
+    private DialogKeys() {
+    }
+
+    /**
+     * Creates a typed key for {@link Dialog} in the registry {@code minecraft:dialog}.
+     *
+     * @param key the value's key in the registry
+     * @return a new typed key
+     */
+    public static TypedKey<Dialog> create(final Key key) {
+        return TypedKey.create(RegistryKey.DIALOG, key);
+    }
+}

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

@@ -2,7 +2,7 @@ package io.papermc.paper.registry.keys;
 
 import static net.kyori.adventure.key.Key.key;
 
-import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedClass
 public final class EnchantmentKeys {
     /**
      * {@code minecraft:aqua_affinity}
@@ -172,6 +172,13 @@ public final class EnchantmentKeys {
      */
     public static final TypedKey<Enchantment> LUCK_OF_THE_SEA = create(key("luck_of_the_sea"));
 
+    /**
+     * {@code minecraft:lunge}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Enchantment> LUNGE = create(key("lunge"));
+
     /**
      * {@code minecraft:lure}
      *

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

@@ -2,7 +2,7 @@ package io.papermc.paper.registry.keys;
 
 import static net.kyori.adventure.key.Key.key;
 
-import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedClass
 public final class FluidKeys {
     /**
      * {@code minecraft:empty}

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

@@ -2,7 +2,7 @@ package io.papermc.paper.registry.keys;
 
 import static net.kyori.adventure.key.Key.key;
 
-import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedClass
 public final class FrogVariantKeys {
     /**
      * {@code minecraft:cold}

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

@@ -2,7 +2,7 @@ package io.papermc.paper.registry.keys;
 
 import static net.kyori.adventure.key.Key.key;
 
-import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedClass
 public final class GameEventKeys {
     /**
      * {@code minecraft:block_activate}
@@ -88,6 +88,13 @@ public final class GameEventKeys {
      */
     public static final TypedKey<GameEvent> BLOCK_PLACE = create(key("block_place"));
 
+    /**
+     * {@code minecraft:bounce}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameEvent> BOUNCE = create(key("bounce"));
+
     /**
      * {@code minecraft:container_close}
      *

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

@@ -0,0 +1,451 @@
+package io.papermc.paper.registry.keys;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.annotation.GeneratedClass;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.TypedKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.GameRule;
+import org.bukkit.MinecraftExperimental;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#GAME_RULE}.
+ *
+ * @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
+@GeneratedClass
+public final class GameRuleKeys {
+    /**
+     * {@code minecraft:advance_time}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> ADVANCE_TIME = create(key("advance_time"));
+
+    /**
+     * {@code minecraft:advance_weather}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> ADVANCE_WEATHER = create(key("advance_weather"));
+
+    /**
+     * {@code minecraft:allow_entering_nether_using_portals}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> ALLOW_ENTERING_NETHER_USING_PORTALS = create(key("allow_entering_nether_using_portals"));
+
+    /**
+     * {@code minecraft:block_drops}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> BLOCK_DROPS = create(key("block_drops"));
+
+    /**
+     * {@code minecraft:block_explosion_drop_decay}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> BLOCK_EXPLOSION_DROP_DECAY = create(key("block_explosion_drop_decay"));
+
+    /**
+     * {@code minecraft:command_block_output}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> COMMAND_BLOCK_OUTPUT = create(key("command_block_output"));
+
+    /**
+     * {@code minecraft:command_blocks_work}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> COMMAND_BLOCKS_WORK = create(key("command_blocks_work"));
+
+    /**
+     * {@code minecraft:drowning_damage}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> DROWNING_DAMAGE = create(key("drowning_damage"));
+
+    /**
+     * {@code minecraft:elytra_movement_check}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> ELYTRA_MOVEMENT_CHECK = create(key("elytra_movement_check"));
+
+    /**
+     * {@code minecraft:ender_pearls_vanish_on_death}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> ENDER_PEARLS_VANISH_ON_DEATH = create(key("ender_pearls_vanish_on_death"));
+
+    /**
+     * {@code minecraft:entity_drops}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> ENTITY_DROPS = create(key("entity_drops"));
+
+    /**
+     * {@code minecraft:fall_damage}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> FALL_DAMAGE = create(key("fall_damage"));
+
+    /**
+     * {@code minecraft:fire_damage}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> FIRE_DAMAGE = create(key("fire_damage"));
+
+    /**
+     * {@code minecraft:fire_spread_radius_around_player}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> FIRE_SPREAD_RADIUS_AROUND_PLAYER = create(key("fire_spread_radius_around_player"));
+
+    /**
+     * {@code minecraft:forgive_dead_players}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> FORGIVE_DEAD_PLAYERS = create(key("forgive_dead_players"));
+
+    /**
+     * {@code minecraft:freeze_damage}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> FREEZE_DAMAGE = create(key("freeze_damage"));
+
+    /**
+     * {@code minecraft:global_sound_events}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> GLOBAL_SOUND_EVENTS = create(key("global_sound_events"));
+
+    /**
+     * {@code minecraft:immediate_respawn}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> IMMEDIATE_RESPAWN = create(key("immediate_respawn"));
+
+    /**
+     * {@code minecraft:keep_inventory}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> KEEP_INVENTORY = create(key("keep_inventory"));
+
+    /**
+     * {@code minecraft:lava_source_conversion}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> LAVA_SOURCE_CONVERSION = create(key("lava_source_conversion"));
+
+    /**
+     * {@code minecraft:limited_crafting}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> LIMITED_CRAFTING = create(key("limited_crafting"));
+
+    /**
+     * {@code minecraft:locator_bar}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> LOCATOR_BAR = create(key("locator_bar"));
+
+    /**
+     * {@code minecraft:log_admin_commands}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> LOG_ADMIN_COMMANDS = create(key("log_admin_commands"));
+
+    /**
+     * {@code minecraft:max_block_modifications}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> MAX_BLOCK_MODIFICATIONS = create(key("max_block_modifications"));
+
+    /**
+     * {@code minecraft:max_command_forks}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> MAX_COMMAND_FORKS = create(key("max_command_forks"));
+
+    /**
+     * {@code minecraft:max_command_sequence_length}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> MAX_COMMAND_SEQUENCE_LENGTH = create(key("max_command_sequence_length"));
+
+    /**
+     * {@code minecraft:max_entity_cramming}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> MAX_ENTITY_CRAMMING = create(key("max_entity_cramming"));
+
+    /**
+     * {@code minecraft:max_minecart_speed}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    @ApiStatus.Experimental
+    @MinecraftExperimental(MinecraftExperimental.Requires.MINECART_IMPROVEMENTS)
+    public static final TypedKey<GameRule<?>> MAX_MINECART_SPEED = create(key("max_minecart_speed"));
+
+    /**
+     * {@code minecraft:max_snow_accumulation_height}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> MAX_SNOW_ACCUMULATION_HEIGHT = create(key("max_snow_accumulation_height"));
+
+    /**
+     * {@code minecraft:mob_drops}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> MOB_DROPS = create(key("mob_drops"));
+
+    /**
+     * {@code minecraft:mob_explosion_drop_decay}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> MOB_EXPLOSION_DROP_DECAY = create(key("mob_explosion_drop_decay"));
+
+    /**
+     * {@code minecraft:mob_griefing}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> MOB_GRIEFING = create(key("mob_griefing"));
+
+    /**
+     * {@code minecraft:natural_health_regeneration}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> NATURAL_HEALTH_REGENERATION = create(key("natural_health_regeneration"));
+
+    /**
+     * {@code minecraft:player_movement_check}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> PLAYER_MOVEMENT_CHECK = create(key("player_movement_check"));
+
+    /**
+     * {@code minecraft:players_nether_portal_creative_delay}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> PLAYERS_NETHER_PORTAL_CREATIVE_DELAY = create(key("players_nether_portal_creative_delay"));
+
+    /**
+     * {@code minecraft:players_nether_portal_default_delay}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> PLAYERS_NETHER_PORTAL_DEFAULT_DELAY = create(key("players_nether_portal_default_delay"));
+
+    /**
+     * {@code minecraft:players_sleeping_percentage}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> PLAYERS_SLEEPING_PERCENTAGE = create(key("players_sleeping_percentage"));
+
+    /**
+     * {@code minecraft:projectiles_can_break_blocks}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> PROJECTILES_CAN_BREAK_BLOCKS = create(key("projectiles_can_break_blocks"));
+
+    /**
+     * {@code minecraft:pvp}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> PVP = create(key("pvp"));
+
+    /**
+     * {@code minecraft:raids}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> RAIDS = create(key("raids"));
+
+    /**
+     * {@code minecraft:random_tick_speed}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> RANDOM_TICK_SPEED = create(key("random_tick_speed"));
+
+    /**
+     * {@code minecraft:reduced_debug_info}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> REDUCED_DEBUG_INFO = create(key("reduced_debug_info"));
+
+    /**
+     * {@code minecraft:respawn_radius}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> RESPAWN_RADIUS = create(key("respawn_radius"));
+
+    /**
+     * {@code minecraft:send_command_feedback}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> SEND_COMMAND_FEEDBACK = create(key("send_command_feedback"));
+
+    /**
+     * {@code minecraft:show_advancement_messages}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> SHOW_ADVANCEMENT_MESSAGES = create(key("show_advancement_messages"));
+
+    /**
+     * {@code minecraft:show_death_messages}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> SHOW_DEATH_MESSAGES = create(key("show_death_messages"));
+
+    /**
+     * {@code minecraft:spawn_mobs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> SPAWN_MOBS = create(key("spawn_mobs"));
+
+    /**
+     * {@code minecraft:spawn_monsters}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> SPAWN_MONSTERS = create(key("spawn_monsters"));
+
+    /**
+     * {@code minecraft:spawn_patrols}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> SPAWN_PATROLS = create(key("spawn_patrols"));
+
+    /**
+     * {@code minecraft:spawn_phantoms}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> SPAWN_PHANTOMS = create(key("spawn_phantoms"));
+
+    /**
+     * {@code minecraft:spawn_wandering_traders}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> SPAWN_WANDERING_TRADERS = create(key("spawn_wandering_traders"));
+
+    /**
+     * {@code minecraft:spawn_wardens}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> SPAWN_WARDENS = create(key("spawn_wardens"));
+
+    /**
+     * {@code minecraft:spawner_blocks_work}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> SPAWNER_BLOCKS_WORK = create(key("spawner_blocks_work"));
+
+    /**
+     * {@code minecraft:spectators_generate_chunks}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> SPECTATORS_GENERATE_CHUNKS = create(key("spectators_generate_chunks"));
+
+    /**
+     * {@code minecraft:spread_vines}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> SPREAD_VINES = create(key("spread_vines"));
+
+    /**
+     * {@code minecraft:tnt_explodes}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> TNT_EXPLODES = create(key("tnt_explodes"));
+
+    /**
+     * {@code minecraft:tnt_explosion_drop_decay}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> TNT_EXPLOSION_DROP_DECAY = create(key("tnt_explosion_drop_decay"));
+
+    /**
+     * {@code minecraft:universal_anger}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> UNIVERSAL_ANGER = create(key("universal_anger"));
+
+    /**
+     * {@code minecraft:water_source_conversion}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<GameRule<?>> WATER_SOURCE_CONVERSION = create(key("water_source_conversion"));
+
+    private GameRuleKeys() {
+    }
+
+    private static TypedKey<GameRule<?>> create(final Key key) {
+        return TypedKey.create(RegistryKey.GAME_RULE, key);
+    }
+}

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

@@ -2,7 +2,7 @@ package io.papermc.paper.registry.keys;
 
 import static net.kyori.adventure.key.Key.key;
 
-import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedClass
 public final class InstrumentKeys {
     /**
      * {@code minecraft:admire_goat_horn}

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

@@ -2,7 +2,7 @@ package io.papermc.paper.registry.keys;
 
 import static net.kyori.adventure.key.Key.key;
 
-import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedClass
 public final class JukeboxSongKeys {
     /**
      * {@code minecraft:11}
@@ -53,6 +53,13 @@ public final class JukeboxSongKeys {
      */
     public static final TypedKey<JukeboxSong> BLOCKS = create(key("blocks"));
 
+    /**
+     * {@code minecraft:bounce}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<JukeboxSong> BOUNCE = create(key("bounce"));
+
     /**
      * {@code minecraft:cat}
      *
@@ -88,6 +95,13 @@ public final class JukeboxSongKeys {
      */
     public static final TypedKey<JukeboxSong> FAR = create(key("far"));
 
+    /**
+     * {@code minecraft:lava_chicken}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<JukeboxSong> LAVA_CHICKEN = create(key("lava_chicken"));
+
     /**
      * {@code minecraft:mall}
      *
@@ -144,6 +158,13 @@ public final class JukeboxSongKeys {
      */
     public static final TypedKey<JukeboxSong> STRAD = create(key("strad"));
 
+    /**
+     * {@code minecraft:tears}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<JukeboxSong> TEARS = create(key("tears"));
+
     /**
      * {@code minecraft:wait}
      *

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

@@ -2,7 +2,7 @@ package io.papermc.paper.registry.keys;
 
 import static net.kyori.adventure.key.Key.key;
 
-import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
@@ -23,8 +23,22 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedClass
 public final class MapDecorationTypeKeys {
+    /**
+     * {@code minecraft:abandoned_camp}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> ABANDONED_CAMP = create(key("abandoned_camp"));
+
+    /**
+     * {@code minecraft:ancient_city}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> ANCIENT_CITY = create(key("ancient_city"));
+
     /**
      * {@code minecraft:banner_black}
      *
@@ -144,6 +158,13 @@ public final class MapDecorationTypeKeys {
      */
     public static final TypedKey<MapCursor.Type> BLUE_MARKER = create(key("blue_marker"));
 
+    /**
+     * {@code minecraft:desert_pyramid}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> DESERT_PYRAMID = create(key("desert_pyramid"));
+
     /**
      * {@code minecraft:frame}
      *
@@ -165,6 +186,13 @@ public final class MapDecorationTypeKeys {
      */
     public static final TypedKey<MapCursor.Type> MANSION = create(key("mansion"));
 
+    /**
+     * {@code minecraft:mineshaft}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> MINESHAFT = create(key("mineshaft"));
+
     /**
      * {@code minecraft:monument}
      *
@@ -172,6 +200,13 @@ public final class MapDecorationTypeKeys {
      */
     public static final TypedKey<MapCursor.Type> MONUMENT = create(key("monument"));
 
+    /**
+     * {@code minecraft:ocean_ruin_warm}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<MapCursor.Type> OCEAN_RUIN_WARM = create(key("ocean_ruin_warm"));
+
     /**
      * {@code minecraft:player}
      *

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

@@ -2,7 +2,7 @@ package io.papermc.paper.registry.keys;
 
 import static net.kyori.adventure.key.Key.key;
 
-import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedClass
 public final class MenuTypeKeys {
     /**
      * {@code minecraft:anvil}

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

@@ -2,7 +2,7 @@ package io.papermc.paper.registry.keys;
 
 import static net.kyori.adventure.key.Key.key;
 
-import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedClass
 public final class MobEffectKeys {
     /**
      * {@code minecraft:absorption}
@@ -46,6 +46,13 @@ public final class MobEffectKeys {
      */
     public static final TypedKey<PotionEffectType> BLINDNESS = create(key("blindness"));
 
+    /**
+     * {@code minecraft:breath_of_the_nautilus}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PotionEffectType> BREATH_OF_THE_NAUTILUS = create(key("breath_of_the_nautilus"));
+
     /**
      * {@code minecraft:conduit_power}
      *

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

@@ -2,7 +2,7 @@ package io.papermc.paper.registry.keys;
 
 import static net.kyori.adventure.key.Key.key;
 
-import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedClass
 public final class PaintingVariantKeys {
     /**
      * {@code minecraft:alban}
@@ -123,6 +123,13 @@ public final class PaintingVariantKeys {
      */
     public static final TypedKey<Art> CREEBET = create(key("creebet"));
 
+    /**
+     * {@code minecraft:dennis}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Art> DENNIS = create(key("dennis"));
+
     /**
      * {@code minecraft:donkey_kong}
      *

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

@@ -0,0 +1,61 @@
+package io.papermc.paper.registry.keys;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.annotation.GeneratedClass;
+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_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
+@GeneratedClass
+public final class PigSoundVariantKeys {
+    /**
+     * {@code minecraft:big}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Pig.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<Pig.SoundVariant> CLASSIC = create(key("classic"));
+
+    /**
+     * {@code minecraft:mini}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Pig.SoundVariant> MINI = create(key("mini"));
+
+    private PigSoundVariantKeys() {
+    }
+
+    /**
+     * Creates a typed key for {@link Pig.SoundVariant} in the registry {@code minecraft:pig_sound_variant}.
+     *
+     * @param key the value's key in the registry
+     * @return a new typed key
+     */
+    public static TypedKey<Pig.SoundVariant> create(final Key key) {
+        return TypedKey.create(RegistryKey.PIG_SOUND_VARIANT, key);
+    }
+}

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

@@ -2,7 +2,7 @@ package io.papermc.paper.registry.keys;
 
 import static net.kyori.adventure.key.Key.key;
 
-import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedClass
 public final class PigVariantKeys {
     /**
      * {@code minecraft:cold}

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

@@ -0,0 +1,181 @@
+package io.papermc.paper.registry.keys;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.annotation.GeneratedClass;
+import io.papermc.paper.entity.poi.PoiType;
+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#POINT_OF_INTEREST_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
+@GeneratedClass
+public final class PoiTypeKeys {
+    /**
+     * {@code minecraft:armorer}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PoiType> ARMORER = create(key("armorer"));
+
+    /**
+     * {@code minecraft:bee_nest}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PoiType> BEE_NEST = create(key("bee_nest"));
+
+    /**
+     * {@code minecraft:beehive}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PoiType> BEEHIVE = create(key("beehive"));
+
+    /**
+     * {@code minecraft:butcher}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PoiType> BUTCHER = create(key("butcher"));
+
+    /**
+     * {@code minecraft:cartographer}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PoiType> CARTOGRAPHER = create(key("cartographer"));
+
+    /**
+     * {@code minecraft:cleric}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PoiType> CLERIC = create(key("cleric"));
+
+    /**
+     * {@code minecraft:farmer}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PoiType> FARMER = create(key("farmer"));
+
+    /**
+     * {@code minecraft:fisherman}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PoiType> FISHERMAN = create(key("fisherman"));
+
+    /**
+     * {@code minecraft:fletcher}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PoiType> FLETCHER = create(key("fletcher"));
+
+    /**
+     * {@code minecraft:home}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PoiType> HOME = create(key("home"));
+
+    /**
+     * {@code minecraft:leatherworker}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PoiType> LEATHERWORKER = create(key("leatherworker"));
+
+    /**
+     * {@code minecraft:librarian}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PoiType> LIBRARIAN = create(key("librarian"));
+
+    /**
+     * {@code minecraft:lightning_rod}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PoiType> LIGHTNING_ROD = create(key("lightning_rod"));
+
+    /**
+     * {@code minecraft:lodestone}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PoiType> LODESTONE = create(key("lodestone"));
+
+    /**
+     * {@code minecraft:mason}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PoiType> MASON = create(key("mason"));
+
+    /**
+     * {@code minecraft:meeting}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PoiType> MEETING = create(key("meeting"));
+
+    /**
+     * {@code minecraft:nether_portal}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PoiType> NETHER_PORTAL = create(key("nether_portal"));
+
+    /**
+     * {@code minecraft:shepherd}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PoiType> SHEPHERD = create(key("shepherd"));
+
+    /**
+     * {@code minecraft:test_instance}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PoiType> TEST_INSTANCE = create(key("test_instance"));
+
+    /**
+     * {@code minecraft:toolsmith}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PoiType> TOOLSMITH = create(key("toolsmith"));
+
+    /**
+     * {@code minecraft:weaponsmith}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<PoiType> WEAPONSMITH = create(key("weaponsmith"));
+
+    private PoiTypeKeys() {
+    }
+
+    private static TypedKey<PoiType> create(final Key key) {
+        return TypedKey.create(RegistryKey.POINT_OF_INTEREST_TYPE, key);
+    }
+}

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

@@ -2,7 +2,7 @@ package io.papermc.paper.registry.keys;
 
 import static net.kyori.adventure.key.Key.key;
 
-import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
@@ -23,8 +23,134 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedClass
 public final class StructureKeys {
+    /**
+     * {@code minecraft:abandoned_camp_bamboo_jungle}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Structure> ABANDONED_CAMP_BAMBOO_JUNGLE = create(key("abandoned_camp_bamboo_jungle"));
+
+    /**
+     * {@code minecraft:abandoned_camp_birch_forest}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Structure> ABANDONED_CAMP_BIRCH_FOREST = create(key("abandoned_camp_birch_forest"));
+
+    /**
+     * {@code minecraft:abandoned_camp_cherry_grove}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Structure> ABANDONED_CAMP_CHERRY_GROVE = create(key("abandoned_camp_cherry_grove"));
+
+    /**
+     * {@code minecraft:abandoned_camp_dappled_forest}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Structure> ABANDONED_CAMP_DAPPLED_FOREST = create(key("abandoned_camp_dappled_forest"));
+
+    /**
+     * {@code minecraft:abandoned_camp_flower_forest}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Structure> ABANDONED_CAMP_FLOWER_FOREST = create(key("abandoned_camp_flower_forest"));
+
+    /**
+     * {@code minecraft:abandoned_camp_forest}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Structure> ABANDONED_CAMP_FOREST = create(key("abandoned_camp_forest"));
+
+    /**
+     * {@code minecraft:abandoned_camp_meadow}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Structure> ABANDONED_CAMP_MEADOW = create(key("abandoned_camp_meadow"));
+
+    /**
+     * {@code minecraft:abandoned_camp_old_growth_birch_forest}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Structure> ABANDONED_CAMP_OLD_GROWTH_BIRCH_FOREST = create(key("abandoned_camp_old_growth_birch_forest"));
+
+    /**
+     * {@code minecraft:abandoned_camp_old_growth_pine_taiga}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Structure> ABANDONED_CAMP_OLD_GROWTH_PINE_TAIGA = create(key("abandoned_camp_old_growth_pine_taiga"));
+
+    /**
+     * {@code minecraft:abandoned_camp_old_growth_spruce_taiga}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Structure> ABANDONED_CAMP_OLD_GROWTH_SPRUCE_TAIGA = create(key("abandoned_camp_old_growth_spruce_taiga"));
+
+    /**
+     * {@code minecraft:abandoned_camp_pale_garden}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Structure> ABANDONED_CAMP_PALE_GARDEN = create(key("abandoned_camp_pale_garden"));
+
+    /**
+     * {@code minecraft:abandoned_camp_savanna}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Structure> ABANDONED_CAMP_SAVANNA = create(key("abandoned_camp_savanna"));
+
+    /**
+     * {@code minecraft:abandoned_camp_snowy_taiga}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Structure> ABANDONED_CAMP_SNOWY_TAIGA = create(key("abandoned_camp_snowy_taiga"));
+
+    /**
+     * {@code minecraft:abandoned_camp_sparse_jungle}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Structure> ABANDONED_CAMP_SPARSE_JUNGLE = create(key("abandoned_camp_sparse_jungle"));
+
+    /**
+     * {@code minecraft:abandoned_camp_swamp}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Structure> ABANDONED_CAMP_SWAMP = create(key("abandoned_camp_swamp"));
+
+    /**
+     * {@code minecraft:abandoned_camp_taiga}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Structure> ABANDONED_CAMP_TAIGA = create(key("abandoned_camp_taiga"));
+
+    /**
+     * {@code minecraft:abandoned_camp_windswept_forest}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Structure> ABANDONED_CAMP_WINDSWEPT_FOREST = create(key("abandoned_camp_windswept_forest"));
+
+    /**
+     * {@code minecraft:abandoned_camp_wooded_badlands}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Structure> ABANDONED_CAMP_WOODED_BADLANDS = create(key("abandoned_camp_wooded_badlands"));
+
     /**
      * {@code minecraft:ancient_city}
      *

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

@@ -2,7 +2,7 @@ package io.papermc.paper.registry.keys;
 
 import static net.kyori.adventure.key.Key.key;
 
-import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedClass
 public final class StructureTypeKeys {
     /**
      * {@code minecraft:buried_treasure}

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

@@ -0,0 +1,124 @@
+package io.papermc.paper.registry.keys;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.annotation.GeneratedClass;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.TypedKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.entity.SulfurCube;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#SULFUR_CUBE_ARCHETYPE}.
+ *
+ * @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
+@GeneratedClass
+public final class SulfurCubeArchetypeKeys {
+    /**
+     * {@code minecraft:bouncy}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<SulfurCube.Archetype> BOUNCY = create(key("bouncy"));
+
+    /**
+     * {@code minecraft:explosive}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<SulfurCube.Archetype> EXPLOSIVE = create(key("explosive"));
+
+    /**
+     * {@code minecraft:fast_flat}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<SulfurCube.Archetype> FAST_FLAT = create(key("fast_flat"));
+
+    /**
+     * {@code minecraft:fast_sliding}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<SulfurCube.Archetype> FAST_SLIDING = create(key("fast_sliding"));
+
+    /**
+     * {@code minecraft:high_resistance}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<SulfurCube.Archetype> HIGH_RESISTANCE = create(key("high_resistance"));
+
+    /**
+     * {@code minecraft:hot}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<SulfurCube.Archetype> HOT = create(key("hot"));
+
+    /**
+     * {@code minecraft:light}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<SulfurCube.Archetype> LIGHT = create(key("light"));
+
+    /**
+     * {@code minecraft:regular}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<SulfurCube.Archetype> REGULAR = create(key("regular"));
+
+    /**
+     * {@code minecraft:slow_bouncy}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<SulfurCube.Archetype> SLOW_BOUNCY = create(key("slow_bouncy"));
+
+    /**
+     * {@code minecraft:slow_flat}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<SulfurCube.Archetype> SLOW_FLAT = create(key("slow_flat"));
+
+    /**
+     * {@code minecraft:slow_sliding}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<SulfurCube.Archetype> SLOW_SLIDING = create(key("slow_sliding"));
+
+    /**
+     * {@code minecraft:sticky}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<SulfurCube.Archetype> STICKY = create(key("sticky"));
+
+    private SulfurCubeArchetypeKeys() {
+    }
+
+    /**
+     * Creates a typed key for {@link SulfurCube.Archetype} in the registry {@code minecraft:sulfur_cube_archetype}.
+     *
+     * @param key the value's key in the registry
+     * @return a new typed key
+     */
+    public static TypedKey<SulfurCube.Archetype> create(final Key key) {
+        return TypedKey.create(RegistryKey.SULFUR_CUBE_ARCHETYPE, key);
+    }
+}

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

@@ -2,7 +2,7 @@ package io.papermc.paper.registry.keys;
 
 import static net.kyori.adventure.key.Key.key;
 
-import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedClass
 public final class TrimMaterialKeys {
     /**
      * {@code minecraft:amethyst}

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

@@ -2,7 +2,7 @@ package io.papermc.paper.registry.keys;
 
 import static net.kyori.adventure.key.Key.key;
 
-import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedClass
 public final class TrimPatternKeys {
     /**
      * {@code minecraft:bolt}

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

@@ -2,7 +2,7 @@ package io.papermc.paper.registry.keys;
 
 import static net.kyori.adventure.key.Key.key;
 
-import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedClass
 public final class VillagerProfessionKeys {
     /**
      * {@code minecraft:armorer}

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

@@ -2,7 +2,7 @@ package io.papermc.paper.registry.keys;
 
 import static net.kyori.adventure.key.Key.key;
 
-import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedClass
 public final class VillagerTypeKeys {
     /**
      * {@code minecraft:desert}

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

@@ -2,7 +2,7 @@ package io.papermc.paper.registry.keys;
 
 import static net.kyori.adventure.key.Key.key;
 
-import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedClass
 public final class WolfSoundVariantKeys {
     /**
      * {@code minecraft:angry}

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

@@ -2,7 +2,7 @@ package io.papermc.paper.registry.keys;
 
 import static net.kyori.adventure.key.Key.key;
 
-import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
+@GeneratedClass
 public final class WolfVariantKeys {
     /**
      * {@code minecraft:ashen}

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

@@ -0,0 +1,54 @@
+package io.papermc.paper.registry.keys;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.annotation.GeneratedClass;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.TypedKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.entity.ZombieNautilus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla keys for {@link RegistryKey#ZOMBIE_NAUTILUS_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
+@GeneratedClass
+public final class ZombieNautilusVariantKeys {
+    /**
+     * {@code minecraft:temperate}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ZombieNautilus.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<ZombieNautilus.Variant> WARM = create(key("warm"));
+
+    private ZombieNautilusVariantKeys() {
+    }
+
+    /**
+     * Creates a typed key for {@link ZombieNautilus.Variant} in the registry {@code minecraft:zombie_nautilus_variant}.
+     *
+     * @param key the value's key in the registry
+     * @return a new typed key
+     */
+    public static TypedKey<ZombieNautilus.Variant> create(final Key key) {
+        return TypedKey.create(RegistryKey.ZOMBIE_NAUTILUS_VARIANT, key);
+    }
+}

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

@@ -2,12 +2,11 @@ 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.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.tag.TagKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.block.banner.PatternType;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -24,8 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
-@ApiStatus.Experimental
+@GeneratedClass
 public final class BannerPatternTagKeys {
     /**
      * {@code #minecraft:no_item_required}
@@ -113,7 +111,6 @@ public final class BannerPatternTagKeys {
      * @param key the tag key's key
      * @return a new tag key
      */
-    @ApiStatus.Experimental
     public static TagKey<PatternType> create(final Key key) {
         return TagKey.create(RegistryKey.BANNER_PATTERN, key);
     }

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

@@ -2,12 +2,11 @@ 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.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.tag.TagKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.block.Biome;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -24,8 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
-@ApiStatus.Experimental
+@GeneratedClass
 public final class BiomeTagKeys {
     /**
      * {@code #minecraft:allows_surface_slime_spawns}
@@ -42,11 +40,130 @@ public final class BiomeTagKeys {
     public static final TagKey<Biome> ALLOWS_TROPICAL_FISH_SPAWNS_AT_ANY_HEIGHT = create(key("allows_tropical_fish_spawns_at_any_height"));
 
     /**
-     * {@code #minecraft:has_closer_water_fog}
+     * {@code #minecraft:has_structure/abandoned_camp_bamboo_jungle}
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    public static final TagKey<Biome> HAS_CLOSER_WATER_FOG = create(key("has_closer_water_fog"));
+    public static final TagKey<Biome> HAS_STRUCTURE_ABANDONED_CAMP_BAMBOO_JUNGLE = create(key("has_structure/abandoned_camp_bamboo_jungle"));
+
+    /**
+     * {@code #minecraft:has_structure/abandoned_camp_birch_forest}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_ABANDONED_CAMP_BIRCH_FOREST = create(key("has_structure/abandoned_camp_birch_forest"));
+
+    /**
+     * {@code #minecraft:has_structure/abandoned_camp_cherry_grove}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_ABANDONED_CAMP_CHERRY_GROVE = create(key("has_structure/abandoned_camp_cherry_grove"));
+
+    /**
+     * {@code #minecraft:has_structure/abandoned_camp_dappled_forest}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_ABANDONED_CAMP_DAPPLED_FOREST = create(key("has_structure/abandoned_camp_dappled_forest"));
+
+    /**
+     * {@code #minecraft:has_structure/abandoned_camp_flower_forest}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_ABANDONED_CAMP_FLOWER_FOREST = create(key("has_structure/abandoned_camp_flower_forest"));
+
+    /**
+     * {@code #minecraft:has_structure/abandoned_camp_forest}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_ABANDONED_CAMP_FOREST = create(key("has_structure/abandoned_camp_forest"));
+
+    /**
+     * {@code #minecraft:has_structure/abandoned_camp_meadow}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_ABANDONED_CAMP_MEADOW = create(key("has_structure/abandoned_camp_meadow"));
+
+    /**
+     * {@code #minecraft:has_structure/abandoned_camp_old_growth_birch_forest}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_ABANDONED_CAMP_OLD_GROWTH_BIRCH_FOREST = create(key("has_structure/abandoned_camp_old_growth_birch_forest"));
+
+    /**
+     * {@code #minecraft:has_structure/abandoned_camp_old_growth_pine_taiga}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_ABANDONED_CAMP_OLD_GROWTH_PINE_TAIGA = create(key("has_structure/abandoned_camp_old_growth_pine_taiga"));
+
+    /**
+     * {@code #minecraft:has_structure/abandoned_camp_old_growth_spruce_taiga}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_ABANDONED_CAMP_OLD_GROWTH_SPRUCE_TAIGA = create(key("has_structure/abandoned_camp_old_growth_spruce_taiga"));
+
+    /**
+     * {@code #minecraft:has_structure/abandoned_camp_pale_garden}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_ABANDONED_CAMP_PALE_GARDEN = create(key("has_structure/abandoned_camp_pale_garden"));
+
+    /**
+     * {@code #minecraft:has_structure/abandoned_camp_savanna}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_ABANDONED_CAMP_SAVANNA = create(key("has_structure/abandoned_camp_savanna"));
+
+    /**
+     * {@code #minecraft:has_structure/abandoned_camp_snowy_taiga}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_ABANDONED_CAMP_SNOWY_TAIGA = create(key("has_structure/abandoned_camp_snowy_taiga"));
+
+    /**
+     * {@code #minecraft:has_structure/abandoned_camp_sparse_jungle}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_ABANDONED_CAMP_SPARSE_JUNGLE = create(key("has_structure/abandoned_camp_sparse_jungle"));
+
+    /**
+     * {@code #minecraft:has_structure/abandoned_camp_swamp}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_ABANDONED_CAMP_SWAMP = create(key("has_structure/abandoned_camp_swamp"));
+
+    /**
+     * {@code #minecraft:has_structure/abandoned_camp_taiga}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_ABANDONED_CAMP_TAIGA = create(key("has_structure/abandoned_camp_taiga"));
+
+    /**
+     * {@code #minecraft:has_structure/abandoned_camp_windswept_forest}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_ABANDONED_CAMP_WINDSWEPT_FOREST = create(key("has_structure/abandoned_camp_windswept_forest"));
+
+    /**
+     * {@code #minecraft:has_structure/abandoned_camp_wooded_badlands}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> HAS_STRUCTURE_ABANDONED_CAMP_WOODED_BADLANDS = create(key("has_structure/abandoned_camp_wooded_badlands"));
 
     /**
      * {@code #minecraft:has_structure/ancient_city}
@@ -286,13 +403,6 @@ public final class BiomeTagKeys {
      */
     public static final TagKey<Biome> HAS_STRUCTURE_WOODLAND_MANSION = create(key("has_structure/woodland_mansion"));
 
-    /**
-     * {@code #minecraft:increased_fire_burnout}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TagKey<Biome> INCREASED_FIRE_BURNOUT = create(key("increased_fire_burnout"));
-
     /**
      * {@code #minecraft:is_badlands}
      *
@@ -405,13 +515,6 @@ public final class BiomeTagKeys {
      */
     public static final TagKey<Biome> MORE_FREQUENT_DROWNED_SPAWNS = create(key("more_frequent_drowned_spawns"));
 
-    /**
-     * {@code #minecraft:plays_underwater_music}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TagKey<Biome> PLAYS_UNDERWATER_MUSIC = create(key("plays_underwater_music"));
-
     /**
      * {@code #minecraft:polar_bears_spawn_on_alternate_blocks}
      *
@@ -440,13 +543,6 @@ public final class BiomeTagKeys {
      */
     public static final TagKey<Biome> REQUIRED_OCEAN_MONUMENT_SURROUNDING = create(key("required_ocean_monument_surrounding"));
 
-    /**
-     * {@code #minecraft:snow_golem_melts}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TagKey<Biome> SNOW_GOLEM_MELTS = create(key("snow_golem_melts"));
-
     /**
      * {@code #minecraft:spawns_cold_variant_farm_animals}
      *
@@ -461,6 +557,13 @@ public final class BiomeTagKeys {
      */
     public static final TagKey<Biome> SPAWNS_COLD_VARIANT_FROGS = create(key("spawns_cold_variant_frogs"));
 
+    /**
+     * {@code #minecraft:spawns_coral_variant_zombie_nautilus}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Biome> SPAWNS_CORAL_VARIANT_ZOMBIE_NAUTILUS = create(key("spawns_coral_variant_zombie_nautilus"));
+
     /**
      * {@code #minecraft:spawns_gold_rabbits}
      *
@@ -510,13 +613,6 @@ public final class BiomeTagKeys {
      */
     public static final TagKey<Biome> WATER_ON_MAP_OUTLINES = create(key("water_on_map_outlines"));
 
-    /**
-     * {@code #minecraft:without_patrol_spawns}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TagKey<Biome> WITHOUT_PATROL_SPAWNS = create(key("without_patrol_spawns"));
-
     /**
      * {@code #minecraft:without_wandering_trader_spawns}
      *
@@ -540,7 +636,6 @@ public final class BiomeTagKeys {
      * @param key the tag key's key
      * @return a new tag key
      */
-    @ApiStatus.Experimental
     public static TagKey<Biome> create(final Key key) {
         return TagKey.create(RegistryKey.BIOME, key);
     }

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

@@ -2,12 +2,11 @@ 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.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.tag.TagKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.damage.DamageType;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -24,8 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
-@ApiStatus.Experimental
+@GeneratedClass
 public final class DamageTypeTagKeys {
     /**
      * {@code #minecraft:always_hurts_ender_dragons}
@@ -83,6 +81,13 @@ public final class DamageTypeTagKeys {
      */
     public static final TagKey<DamageType> BYPASSES_ARMOR = create(key("bypasses_armor"));
 
+    /**
+     * {@code #minecraft:bypasses_cooldown}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> BYPASSES_COOLDOWN = create(key("bypasses_cooldown"));
+
     /**
      * {@code #minecraft:bypasses_effects}
      *
@@ -230,6 +235,13 @@ public final class DamageTypeTagKeys {
      */
     public static final TagKey<DamageType> NO_KNOCKBACK = create(key("no_knockback"));
 
+    /**
+     * {@code #minecraft:no_wolf_retaliation}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> NO_WOLF_RETALIATION = create(key("no_wolf_retaliation"));
+
     /**
      * {@code #minecraft:panic_causes}
      *
@@ -244,6 +256,13 @@ public final class DamageTypeTagKeys {
      */
     public static final TagKey<DamageType> PANIC_ENVIRONMENTAL_CAUSES = create(key("panic_environmental_causes"));
 
+    /**
+     * {@code #minecraft:sulfur_cube_with_block_immune_to}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<DamageType> SULFUR_CUBE_WITH_BLOCK_IMMUNE_TO = create(key("sulfur_cube_with_block_immune_to"));
+
     /**
      * {@code #minecraft:witch_resistant_to}
      *
@@ -267,7 +286,6 @@ public final class DamageTypeTagKeys {
      * @param key the tag key's key
      * @return a new tag key
      */
-    @ApiStatus.Experimental
     public static TagKey<DamageType> create(final Key key) {
         return TagKey.create(RegistryKey.DAMAGE_TYPE, key);
     }

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

@@ -0,0 +1,54 @@
+package io.papermc.paper.registry.keys.tags;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.annotation.GeneratedClass;
+import io.papermc.paper.dialog.Dialog;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.tag.TagKey;
+import net.kyori.adventure.key.Key;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla tag keys for {@link RegistryKey#DIALOG}.
+ *
+ * @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
+@GeneratedClass
+public final class DialogTagKeys {
+    /**
+     * {@code #minecraft:pause_screen_additions}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Dialog> PAUSE_SCREEN_ADDITIONS = create(key("pause_screen_additions"));
+
+    /**
+     * {@code #minecraft:quick_actions}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Dialog> QUICK_ACTIONS = create(key("quick_actions"));
+
+    private DialogTagKeys() {
+    }
+
+    /**
+     * Creates a tag key for {@link Dialog} in the registry {@code minecraft:dialog}.
+     *
+     * @param key the tag key's key
+     * @return a new tag key
+     */
+    public static TagKey<Dialog> create(final Key key) {
+        return TagKey.create(RegistryKey.DIALOG, key);
+    }
+}

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

@@ -2,7 +2,7 @@ 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.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.tag.TagKey;
 import net.kyori.adventure.key.Key;
@@ -25,8 +25,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
-@ApiStatus.Experimental
+@GeneratedClass
 public final class EnchantmentTagKeys {
     /**
      * {@code #minecraft:curse}
@@ -184,15 +183,6 @@ public final class EnchantmentTagKeys {
     @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
     public static final TagKey<Enchantment> TRADES_DESERT_COMMON = create(key("trades/desert_common"));
 
-    /**
-     * {@code #minecraft:trades/desert_special}
-     *
-     * @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<Enchantment> TRADES_DESERT_SPECIAL = create(key("trades/desert_special"));
-
     /**
      * {@code #minecraft:trades/jungle_common}
      *
@@ -202,15 +192,6 @@ public final class EnchantmentTagKeys {
     @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
     public static final TagKey<Enchantment> TRADES_JUNGLE_COMMON = create(key("trades/jungle_common"));
 
-    /**
-     * {@code #minecraft:trades/jungle_special}
-     *
-     * @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<Enchantment> TRADES_JUNGLE_SPECIAL = create(key("trades/jungle_special"));
-
     /**
      * {@code #minecraft:trades/plains_common}
      *
@@ -220,15 +201,6 @@ public final class EnchantmentTagKeys {
     @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
     public static final TagKey<Enchantment> TRADES_PLAINS_COMMON = create(key("trades/plains_common"));
 
-    /**
-     * {@code #minecraft:trades/plains_special}
-     *
-     * @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<Enchantment> TRADES_PLAINS_SPECIAL = create(key("trades/plains_special"));
-
     /**
      * {@code #minecraft:trades/savanna_common}
      *
@@ -238,15 +210,6 @@ public final class EnchantmentTagKeys {
     @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
     public static final TagKey<Enchantment> TRADES_SAVANNA_COMMON = create(key("trades/savanna_common"));
 
-    /**
-     * {@code #minecraft:trades/savanna_special}
-     *
-     * @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<Enchantment> TRADES_SAVANNA_SPECIAL = create(key("trades/savanna_special"));
-
     /**
      * {@code #minecraft:trades/snow_common}
      *
@@ -256,15 +219,6 @@ public final class EnchantmentTagKeys {
     @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
     public static final TagKey<Enchantment> TRADES_SNOW_COMMON = create(key("trades/snow_common"));
 
-    /**
-     * {@code #minecraft:trades/snow_special}
-     *
-     * @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<Enchantment> TRADES_SNOW_SPECIAL = create(key("trades/snow_special"));
-
     /**
      * {@code #minecraft:trades/swamp_common}
      *
@@ -274,15 +228,6 @@ public final class EnchantmentTagKeys {
     @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
     public static final TagKey<Enchantment> TRADES_SWAMP_COMMON = create(key("trades/swamp_common"));
 
-    /**
-     * {@code #minecraft:trades/swamp_special}
-     *
-     * @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<Enchantment> TRADES_SWAMP_SPECIAL = create(key("trades/swamp_special"));
-
     /**
      * {@code #minecraft:trades/taiga_common}
      *
@@ -292,15 +237,6 @@ public final class EnchantmentTagKeys {
     @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE)
     public static final TagKey<Enchantment> TRADES_TAIGA_COMMON = create(key("trades/taiga_common"));
 
-    /**
-     * {@code #minecraft:trades/taiga_special}
-     *
-     * @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<Enchantment> TRADES_TAIGA_SPECIAL = create(key("trades/taiga_special"));
-
     /**
      * {@code #minecraft:treasure}
      *
@@ -317,7 +253,6 @@ public final class EnchantmentTagKeys {
      * @param key the tag key's key
      * @return a new tag key
      */
-    @ApiStatus.Experimental
     public static TagKey<Enchantment> create(final Key key) {
         return TagKey.create(RegistryKey.ENCHANTMENT, key);
     }

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

@@ -2,12 +2,11 @@ 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.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.tag.TagKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.entity.EntityType;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -24,9 +23,15 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
-@ApiStatus.Experimental
+@GeneratedClass
 public final class EntityTypeTagKeys {
+    /**
+     * {@code #minecraft:accepts_iron_golem_gift}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<EntityType> ACCEPTS_IRON_GOLEM_GIFT = create(key("accepts_iron_golem_gift"));
+
     /**
      * {@code #minecraft:aquatic}
      *
@@ -76,6 +81,13 @@ public final class EntityTypeTagKeys {
      */
     public static final TagKey<EntityType> BOAT = create(key("boat"));
 
+    /**
+     * {@code #minecraft:burn_in_daylight}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<EntityType> BURN_IN_DAYLIGHT = create(key("burn_in_daylight"));
+
     /**
      * {@code #minecraft:can_breathe_under_water}
      *
@@ -83,6 +95,13 @@ public final class EntityTypeTagKeys {
      */
     public static final TagKey<EntityType> CAN_BREATHE_UNDER_WATER = create(key("can_breathe_under_water"));
 
+    /**
+     * {@code #minecraft:can_equip_harness}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<EntityType> CAN_EQUIP_HARNESS = create(key("can_equip_harness"));
+
     /**
      * {@code #minecraft:can_equip_saddle}
      *
@@ -90,6 +109,13 @@ public final class EntityTypeTagKeys {
      */
     public static final TagKey<EntityType> CAN_EQUIP_SADDLE = create(key("can_equip_saddle"));
 
+    /**
+     * {@code #minecraft:can_float_while_ridden}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<EntityType> CAN_FLOAT_WHILE_RIDDEN = create(key("can_float_while_ridden"));
+
     /**
      * {@code #minecraft:can_turn_in_boats}
      *
@@ -104,6 +130,41 @@ public final class EntityTypeTagKeys {
      */
     public static final TagKey<EntityType> CAN_WEAR_HORSE_ARMOR = create(key("can_wear_horse_armor"));
 
+    /**
+     * {@code #minecraft:can_wear_nautilus_armor}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<EntityType> CAN_WEAR_NAUTILUS_ARMOR = create(key("can_wear_nautilus_armor"));
+
+    /**
+     * {@code #minecraft:candidate_for_iron_golem_gift}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<EntityType> CANDIDATE_FOR_IRON_GOLEM_GIFT = create(key("candidate_for_iron_golem_gift"));
+
+    /**
+     * {@code #minecraft:cannot_be_age_locked}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<EntityType> CANNOT_BE_AGE_LOCKED = create(key("cannot_be_age_locked"));
+
+    /**
+     * {@code #minecraft:cannot_be_dismounted_by_item_usage}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<EntityType> CANNOT_BE_DISMOUNTED_BY_ITEM_USAGE = create(key("cannot_be_dismounted_by_item_usage"));
+
+    /**
+     * {@code #minecraft:cannot_be_pushed_onto_boats}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<EntityType> CANNOT_BE_PUSHED_ONTO_BOATS = create(key("cannot_be_pushed_onto_boats"));
+
     /**
      * {@code #minecraft:deflects_projectiles}
      *
@@ -125,6 +186,13 @@ public final class EntityTypeTagKeys {
      */
     public static final TagKey<EntityType> FALL_DAMAGE_IMMUNE = create(key("fall_damage_immune"));
 
+    /**
+     * {@code #minecraft:followable_friendly_mobs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<EntityType> FOLLOWABLE_FRIENDLY_MOBS = create(key("followable_friendly_mobs"));
+
     /**
      * {@code #minecraft:freeze_hurts_extra_types}
      *
@@ -195,6 +263,13 @@ public final class EntityTypeTagKeys {
      */
     public static final TagKey<EntityType> INVERTED_HEALING_AND_HARM = create(key("inverted_healing_and_harm"));
 
+    /**
+     * {@code #minecraft:nautilus_hostiles}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<EntityType> NAUTILUS_HOSTILES = create(key("nautilus_hostiles"));
+
     /**
      * {@code #minecraft:no_anger_from_wind_charge}
      *
@@ -209,6 +284,13 @@ public final class EntityTypeTagKeys {
      */
     public static final TagKey<EntityType> NON_CONTROLLING_RIDER = create(key("non_controlling_rider"));
 
+    /**
+     * {@code #minecraft:not_affected_by_geysers}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<EntityType> NOT_AFFECTED_BY_GEYSERS = create(key("not_affected_by_geysers"));
+
     /**
      * {@code #minecraft:not_scary_for_pufferfish}
      *
@@ -295,7 +377,6 @@ public final class EntityTypeTagKeys {
      * @param key the tag key's key
      * @return a new tag key
      */
-    @ApiStatus.Experimental
     public static TagKey<EntityType> create(final Key key) {
         return TagKey.create(RegistryKey.ENTITY_TYPE, key);
     }

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

@@ -2,12 +2,11 @@ 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.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.tag.TagKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.Fluid;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -24,9 +23,43 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
-@ApiStatus.Experimental
+@GeneratedClass
 public final class FluidTagKeys {
+    /**
+     * {@code #minecraft:axolotl_tries_to_find}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Fluid> AXOLOTL_TRIES_TO_FIND = create(key("axolotl_tries_to_find"));
+
+    /**
+     * {@code #minecraft:bubble_column_can_occupy}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Fluid> BUBBLE_COLUMN_CAN_OCCUPY = create(key("bubble_column_can_occupy"));
+
+    /**
+     * {@code #minecraft:dolphin_tries_to_find}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Fluid> DOLPHIN_TRIES_TO_FIND = create(key("dolphin_tries_to_find"));
+
+    /**
+     * {@code #minecraft:entity_floatable}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Fluid> ENTITY_FLOATABLE = create(key("entity_floatable"));
+
+    /**
+     * {@code #minecraft:frog_tries_to_find_land_near}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Fluid> FROG_TRIES_TO_FIND_LAND_NEAR = create(key("frog_tries_to_find_land_near"));
+
     /**
      * {@code #minecraft:lava}
      *
@@ -34,6 +67,27 @@ public final class FluidTagKeys {
      */
     public static final TagKey<Fluid> LAVA = create(key("lava"));
 
+    /**
+     * {@code #minecraft:supports_frogspawn}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Fluid> SUPPORTS_FROGSPAWN = create(key("supports_frogspawn"));
+
+    /**
+     * {@code #minecraft:supports_lily_pad}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Fluid> SUPPORTS_LILY_PAD = create(key("supports_lily_pad"));
+
+    /**
+     * {@code #minecraft:supports_sugar_cane_adjacently}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Fluid> SUPPORTS_SUGAR_CANE_ADJACENTLY = create(key("supports_sugar_cane_adjacently"));
+
     /**
      * {@code #minecraft:water}
      *
@@ -50,7 +104,6 @@ public final class FluidTagKeys {
      * @param key the tag key's key
      * @return a new tag key
      */
-    @ApiStatus.Experimental
     public static TagKey<Fluid> create(final Key key) {
         return TagKey.create(RegistryKey.FLUID, key);
     }

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

@@ -2,12 +2,11 @@ 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.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.tag.TagKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.GameEvent;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -24,8 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
-@ApiStatus.Experimental
+@GeneratedClass
 public final class GameEventTagKeys {
     /**
      * {@code #minecraft:allay_can_listen}
@@ -71,7 +69,6 @@ public final class GameEventTagKeys {
      * @param key the tag key's key
      * @return a new tag key
      */
-    @ApiStatus.Experimental
     public static TagKey<GameEvent> create(final Key key) {
         return TagKey.create(RegistryKey.GAME_EVENT, key);
     }

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

@@ -2,12 +2,11 @@ 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.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.tag.TagKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.MusicInstrument;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -24,8 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
-@ApiStatus.Experimental
+@GeneratedClass
 public final class InstrumentTagKeys {
     /**
      * {@code #minecraft:goat_horns}
@@ -57,7 +55,6 @@ public final class InstrumentTagKeys {
      * @param key the tag key's key
      * @return a new tag key
      */
-    @ApiStatus.Experimental
     public static TagKey<MusicInstrument> create(final Key key) {
         return TagKey.create(RegistryKey.INSTRUMENT, key);
     }

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

@@ -2,12 +2,11 @@ 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.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.tag.TagKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.inventory.ItemType;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -24,8 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
-@ApiStatus.Experimental
+@GeneratedClass
 public final class ItemTypeTagKeys {
     /**
      * {@code #minecraft:acacia_logs}
@@ -83,6 +81,13 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> BANNERS = create(key("banners"));
 
+    /**
+     * {@code #minecraft:bars}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> BARS = create(key("bars"));
+
     /**
      * {@code #minecraft:beacon_payment_items}
      *
@@ -140,11 +145,11 @@ public final class ItemTypeTagKeys {
     public static final TagKey<ItemType> BREAKS_DECORATED_POTS = create(key("breaks_decorated_pots"));
 
     /**
-     * {@code #minecraft:brewing_fuel}
+     * {@code #minecraft:brewing_potion_inputs}
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    public static final TagKey<ItemType> BREWING_FUEL = create(key("brewing_fuel"));
+    public static final TagKey<ItemType> BREWING_POTION_INPUTS = create(key("brewing_potion_inputs"));
 
     /**
      * {@code #minecraft:bundles}
@@ -167,6 +172,13 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> CAMEL_FOOD = create(key("camel_food"));
 
+    /**
+     * {@code #minecraft:camel_husk_food}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> CAMEL_HUSK_FOOD = create(key("camel_husk_food"));
+
     /**
      * {@code #minecraft:candles}
      *
@@ -174,6 +186,13 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> CANDLES = create(key("candles"));
 
+    /**
+     * {@code #minecraft:cat_collar_dyes}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> CAT_COLLAR_DYES = create(key("cat_collar_dyes"));
+
     /**
      * {@code #minecraft:cat_food}
      *
@@ -181,6 +200,20 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> CAT_FOOD = create(key("cat_food"));
 
+    /**
+     * {@code #minecraft:cauldron_can_remove_dye}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> CAULDRON_CAN_REMOVE_DYE = create(key("cauldron_can_remove_dye"));
+
+    /**
+     * {@code #minecraft:chains}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> CHAINS = create(key("chains"));
+
     /**
      * {@code #minecraft:cherry_logs}
      *
@@ -209,6 +242,13 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> CHICKEN_FOOD = create(key("chicken_food"));
 
+    /**
+     * {@code #minecraft:clonable_maps}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> CLONABLE_MAPS = create(key("clonable_maps"));
+
     /**
      * {@code #minecraft:cluster_max_harvestables}
      *
@@ -244,6 +284,55 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> COMPLETES_FIND_TREE_TUTORIAL = create(key("completes_find_tree_tutorial"));
 
+    /**
+     * {@code #minecraft:concrete}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> CONCRETE = create(key("concrete"));
+
+    /**
+     * {@code #minecraft:concrete_powders}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> CONCRETE_POWDERS = create(key("concrete_powders"));
+
+    /**
+     * {@code #minecraft:concrete_slabs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> CONCRETE_SLABS = create(key("concrete_slabs"));
+
+    /**
+     * {@code #minecraft:concrete_stairs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> CONCRETE_STAIRS = create(key("concrete_stairs"));
+
+    /**
+     * {@code #minecraft:copper}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> COPPER = create(key("copper"));
+
+    /**
+     * {@code #minecraft:copper_chests}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> COPPER_CHESTS = create(key("copper_chests"));
+
+    /**
+     * {@code #minecraft:copper_golem_statues}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> COPPER_GOLEM_STATUES = create(key("copper_golem_statues"));
+
     /**
      * {@code #minecraft:copper_ores}
      *
@@ -251,6 +340,13 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> COPPER_ORES = create(key("copper_ores"));
 
+    /**
+     * {@code #minecraft:copper_tool_materials}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> COPPER_TOOL_MATERIALS = create(key("copper_tool_materials"));
+
     /**
      * {@code #minecraft:cow_food}
      *
@@ -279,6 +375,13 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> CRIMSON_STEMS = create(key("crimson_stems"));
 
+    /**
+     * {@code #minecraft:cushions}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> CUSHIONS = create(key("cushions"));
+
     /**
      * {@code #minecraft:dampens_vibrations}
      *
@@ -335,6 +438,13 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> DOORS = create(key("doors"));
 
+    /**
+     * {@code #minecraft:douses_campfires}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> DOUSES_CAMPFIRES = create(key("douses_campfires"));
+
     /**
      * {@code #minecraft:drowned_preferred_weapons}
      *
@@ -350,11 +460,11 @@ public final class ItemTypeTagKeys {
     public static final TagKey<ItemType> DUPLICATES_ALLAYS = create(key("duplicates_allays"));
 
     /**
-     * {@code #minecraft:dyeable}
+     * {@code #minecraft:dyes}
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    public static final TagKey<ItemType> DYEABLE = create(key("dyeable"));
+    public static final TagKey<ItemType> DYES = create(key("dyes"));
 
     /**
      * {@code #minecraft:eggs}
@@ -447,6 +557,13 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> ENCHANTABLE_LEG_ARMOR = create(key("enchantable/leg_armor"));
 
+    /**
+     * {@code #minecraft:enchantable/lunge}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> ENCHANTABLE_LUNGE = create(key("enchantable/lunge"));
+
     /**
      * {@code #minecraft:enchantable/mace}
      *
@@ -454,6 +571,13 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> ENCHANTABLE_MACE = create(key("enchantable/mace"));
 
+    /**
+     * {@code #minecraft:enchantable/melee_weapon}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> ENCHANTABLE_MELEE_WEAPON = create(key("enchantable/melee_weapon"));
+
     /**
      * {@code #minecraft:enchantable/mining}
      *
@@ -476,11 +600,11 @@ public final class ItemTypeTagKeys {
     public static final TagKey<ItemType> ENCHANTABLE_SHARP_WEAPON = create(key("enchantable/sharp_weapon"));
 
     /**
-     * {@code #minecraft:enchantable/sword}
+     * {@code #minecraft:enchantable/sweeping}
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    public static final TagKey<ItemType> ENCHANTABLE_SWORD = create(key("enchantable/sword"));
+    public static final TagKey<ItemType> ENCHANTABLE_SWEEPING = create(key("enchantable/sweeping"));
 
     /**
      * {@code #minecraft:enchantable/trident}
@@ -503,6 +627,13 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> ENCHANTABLE_WEAPON = create(key("enchantable/weapon"));
 
+    /**
+     * {@code #minecraft:extendable_maps}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> EXTENDABLE_MAPS = create(key("extendable_maps"));
+
     /**
      * {@code #minecraft:fence_gates}
      *
@@ -559,6 +690,13 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> FROG_FOOD = create(key("frog_food"));
 
+    /**
+     * {@code #minecraft:furnace_fuel_bottom_takeable}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> FURNACE_FUEL_BOTTOM_TAKEABLE = create(key("furnace_fuel_bottom_takeable"));
+
     /**
      * {@code #minecraft:furnace_minecart_fuel}
      *
@@ -573,6 +711,13 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> GAZE_DISGUISE_EQUIPMENT = create(key("gaze_disguise_equipment"));
 
+    /**
+     * {@code #minecraft:glazed_terracotta}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> GLAZED_TERRACOTTA = create(key("glazed_terracotta"));
+
     /**
      * {@code #minecraft:goat_food}
      *
@@ -594,6 +739,13 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> GOLD_TOOL_MATERIALS = create(key("gold_tool_materials"));
 
+    /**
+     * {@code #minecraft:grass_blocks}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> GRASS_BLOCKS = create(key("grass_blocks"));
+
     /**
      * {@code #minecraft:hanging_signs}
      *
@@ -601,6 +753,27 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> HANGING_SIGNS = create(key("hanging_signs"));
 
+    /**
+     * {@code #minecraft:happy_ghast_food}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> HAPPY_GHAST_FOOD = create(key("happy_ghast_food"));
+
+    /**
+     * {@code #minecraft:happy_ghast_tempt_items}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> HAPPY_GHAST_TEMPT_ITEMS = create(key("happy_ghast_tempt_items"));
+
+    /**
+     * {@code #minecraft:harnesses}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> HARNESSES = create(key("harnesses"));
+
     /**
      * {@code #minecraft:head_armor}
      *
@@ -664,6 +837,13 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> JUNGLE_LOGS = create(key("jungle_logs"));
 
+    /**
+     * {@code #minecraft:lanterns}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> LANTERNS = create(key("lanterns"));
+
     /**
      * {@code #minecraft:lapis_ores}
      *
@@ -692,6 +872,13 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> LEG_ARMOR = create(key("leg_armor"));
 
+    /**
+     * {@code #minecraft:lightning_rods}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> LIGHTNING_RODS = create(key("lightning_rods"));
+
     /**
      * {@code #minecraft:llama_food}
      *
@@ -720,6 +907,20 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> LOGS_THAT_BURN = create(key("logs_that_burn"));
 
+    /**
+     * {@code #minecraft:loom_dyes}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> LOOM_DYES = create(key("loom_dyes"));
+
+    /**
+     * {@code #minecraft:loom_patterns}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> LOOM_PATTERNS = create(key("loom_patterns"));
+
     /**
      * {@code #minecraft:mangrove_logs}
      *
@@ -741,6 +942,55 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> MEAT = create(key("meat"));
 
+    /**
+     * {@code #minecraft:metal_nuggets}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> METAL_NUGGETS = create(key("metal_nuggets"));
+
+    /**
+     * {@code #minecraft:moss_blocks}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> MOSS_BLOCKS = create(key("moss_blocks"));
+
+    /**
+     * {@code #minecraft:mud}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> MUD = create(key("mud"));
+
+    /**
+     * {@code #minecraft:mushrooms}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> MUSHROOMS = create(key("mushrooms"));
+
+    /**
+     * {@code #minecraft:nautilus_bucket_food}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> NAUTILUS_BUCKET_FOOD = create(key("nautilus_bucket_food"));
+
+    /**
+     * {@code #minecraft:nautilus_food}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> NAUTILUS_FOOD = create(key("nautilus_food"));
+
+    /**
+     * {@code #minecraft:nautilus_taming_items}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> NAUTILUS_TAMING_ITEMS = create(key("nautilus_taming_items"));
+
     /**
      * {@code #minecraft:netherite_tool_materials}
      *
@@ -776,6 +1026,13 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> OCELOT_FOOD = create(key("ocelot_food"));
 
+    /**
+     * {@code #minecraft:ores}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> ORES = create(key("ores"));
+
     /**
      * {@code #minecraft:pale_oak_logs}
      *
@@ -874,6 +1131,13 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> PLANKS = create(key("planks"));
 
+    /**
+     * {@code #minecraft:poplar_logs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> POPLAR_LOGS = create(key("poplar_logs"));
+
     /**
      * {@code #minecraft:rabbit_food}
      *
@@ -902,6 +1166,13 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> REPAIRS_CHAIN_ARMOR = create(key("repairs_chain_armor"));
 
+    /**
+     * {@code #minecraft:repairs_copper_armor}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> REPAIRS_COPPER_ARMOR = create(key("repairs_copper_armor"));
+
     /**
      * {@code #minecraft:repairs_diamond_armor}
      *
@@ -965,6 +1236,13 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> SAPLINGS = create(key("saplings"));
 
+    /**
+     * {@code #minecraft:shearable_from_copper_golem}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> SHEARABLE_FROM_COPPER_GOLEM = create(key("shearable_from_copper_golem"));
+
     /**
      * {@code #minecraft:sheep_food}
      *
@@ -1042,6 +1320,13 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> SOUL_FIRE_BASE_BLOCKS = create(key("soul_fire_base_blocks"));
 
+    /**
+     * {@code #minecraft:spears}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> SPEARS = create(key("spears"));
+
     /**
      * {@code #minecraft:spruce_logs}
      *
@@ -1098,6 +1383,104 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> STRIDER_TEMPT_ITEMS = create(key("strider_tempt_items"));
 
+    /**
+     * {@code #minecraft:sulfur_cube_archetype/bouncy}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> SULFUR_CUBE_ARCHETYPE_BOUNCY = create(key("sulfur_cube_archetype/bouncy"));
+
+    /**
+     * {@code #minecraft:sulfur_cube_archetype/explosive}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> SULFUR_CUBE_ARCHETYPE_EXPLOSIVE = create(key("sulfur_cube_archetype/explosive"));
+
+    /**
+     * {@code #minecraft:sulfur_cube_archetype/fast_flat}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> SULFUR_CUBE_ARCHETYPE_FAST_FLAT = create(key("sulfur_cube_archetype/fast_flat"));
+
+    /**
+     * {@code #minecraft:sulfur_cube_archetype/fast_sliding}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> SULFUR_CUBE_ARCHETYPE_FAST_SLIDING = create(key("sulfur_cube_archetype/fast_sliding"));
+
+    /**
+     * {@code #minecraft:sulfur_cube_archetype/high_resistance}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> SULFUR_CUBE_ARCHETYPE_HIGH_RESISTANCE = create(key("sulfur_cube_archetype/high_resistance"));
+
+    /**
+     * {@code #minecraft:sulfur_cube_archetype/hot}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> SULFUR_CUBE_ARCHETYPE_HOT = create(key("sulfur_cube_archetype/hot"));
+
+    /**
+     * {@code #minecraft:sulfur_cube_archetype/light}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> SULFUR_CUBE_ARCHETYPE_LIGHT = create(key("sulfur_cube_archetype/light"));
+
+    /**
+     * {@code #minecraft:sulfur_cube_archetype/regular}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> SULFUR_CUBE_ARCHETYPE_REGULAR = create(key("sulfur_cube_archetype/regular"));
+
+    /**
+     * {@code #minecraft:sulfur_cube_archetype/slow_bouncy}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> SULFUR_CUBE_ARCHETYPE_SLOW_BOUNCY = create(key("sulfur_cube_archetype/slow_bouncy"));
+
+    /**
+     * {@code #minecraft:sulfur_cube_archetype/slow_flat}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> SULFUR_CUBE_ARCHETYPE_SLOW_FLAT = create(key("sulfur_cube_archetype/slow_flat"));
+
+    /**
+     * {@code #minecraft:sulfur_cube_archetype/slow_sliding}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> SULFUR_CUBE_ARCHETYPE_SLOW_SLIDING = create(key("sulfur_cube_archetype/slow_sliding"));
+
+    /**
+     * {@code #minecraft:sulfur_cube_archetype/sticky}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> SULFUR_CUBE_ARCHETYPE_STICKY = create(key("sulfur_cube_archetype/sticky"));
+
+    /**
+     * {@code #minecraft:sulfur_cube_food}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> SULFUR_CUBE_FOOD = create(key("sulfur_cube_food"));
+
+    /**
+     * {@code #minecraft:sulfur_cube_swallowable}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> SULFUR_CUBE_SWALLOWABLE = create(key("sulfur_cube_swallowable"));
+
     /**
      * {@code #minecraft:swords}
      *
@@ -1182,6 +1565,13 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> WITHER_SKELETON_DISLIKED_WEAPONS = create(key("wither_skeleton_disliked_weapons"));
 
+    /**
+     * {@code #minecraft:wolf_collar_dyes}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> WOLF_COLLAR_DYES = create(key("wolf_collar_dyes"));
+
     /**
      * {@code #minecraft:wolf_food}
      *
@@ -1217,6 +1607,13 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> WOODEN_PRESSURE_PLATES = create(key("wooden_pressure_plates"));
 
+    /**
+     * {@code #minecraft:wooden_shelves}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> WOODEN_SHELVES = create(key("wooden_shelves"));
+
     /**
      * {@code #minecraft:wooden_slabs}
      *
@@ -1259,6 +1656,27 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> WOOL_CARPETS = create(key("wool_carpets"));
 
+    /**
+     * {@code #minecraft:wool_slabs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> WOOL_SLABS = create(key("wool_slabs"));
+
+    /**
+     * {@code #minecraft:wool_stairs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> WOOL_STAIRS = create(key("wool_stairs"));
+
+    /**
+     * {@code #minecraft:zombie_horse_food}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> ZOMBIE_HORSE_FOOD = create(key("zombie_horse_food"));
+
     private ItemTypeTagKeys() {
     }
 
@@ -1268,7 +1686,6 @@ public final class ItemTypeTagKeys {
      * @param key the tag key's key
      * @return a new tag key
      */
-    @ApiStatus.Experimental
     public static TagKey<ItemType> create(final Key key) {
         return TagKey.create(RegistryKey.ITEM, key);
     }

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

@@ -2,12 +2,11 @@ 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.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.tag.TagKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.Art;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -24,8 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
-@ApiStatus.Experimental
+@GeneratedClass
 public final class PaintingVariantTagKeys {
     /**
      * {@code #minecraft:placeable}
@@ -43,7 +41,6 @@ public final class PaintingVariantTagKeys {
      * @param key the tag key's key
      * @return a new tag key
      */
-    @ApiStatus.Experimental
     public static TagKey<Art> create(final Key key) {
         return TagKey.create(RegistryKey.PAINTING_VARIANT, key);
     }

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

@@ -0,0 +1,61 @@
+package io.papermc.paper.registry.keys.tags;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.annotation.GeneratedClass;
+import io.papermc.paper.entity.poi.PoiType;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.tag.TagKey;
+import net.kyori.adventure.key.Key;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla tag keys for {@link RegistryKey#POINT_OF_INTEREST_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
+@GeneratedClass
+public final class PoiTypeTagKeys {
+    /**
+     * {@code #minecraft:acquirable_job_site}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<PoiType> ACQUIRABLE_JOB_SITE = create(key("acquirable_job_site"));
+
+    /**
+     * {@code #minecraft:bee_home}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<PoiType> BEE_HOME = create(key("bee_home"));
+
+    /**
+     * {@code #minecraft:village}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<PoiType> VILLAGE = create(key("village"));
+
+    private PoiTypeTagKeys() {
+    }
+
+    /**
+     * Creates a tag key for {@link PoiType} in the registry {@code minecraft:point_of_interest_type}.
+     *
+     * @param key the tag key's key
+     * @return a new tag key
+     */
+    public static TagKey<PoiType> create(final Key key) {
+        return TagKey.create(RegistryKey.POINT_OF_INTEREST_TYPE, key);
+    }
+}

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

@@ -0,0 +1,75 @@
+package io.papermc.paper.registry.keys.tags;
+
+import static net.kyori.adventure.key.Key.key;
+
+import io.papermc.paper.annotation.GeneratedClass;
+import io.papermc.paper.registry.RegistryKey;
+import io.papermc.paper.registry.tag.TagKey;
+import net.kyori.adventure.key.Key;
+import org.bukkit.potion.PotionType;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Vanilla tag keys for {@link RegistryKey#POTION}.
+ *
+ * @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
+@GeneratedClass
+public final class PotionTypeTagKeys {
+    /**
+     * {@code #minecraft:douses_fire}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<PotionType> DOUSES_FIRE = create(key("douses_fire"));
+
+    /**
+     * {@code #minecraft:extinguishes_entities}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<PotionType> EXTINGUISHES_ENTITIES = create(key("extinguishes_entities"));
+
+    /**
+     * {@code #minecraft:hurts_water_sensitive_entities}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<PotionType> HURTS_WATER_SENSITIVE_ENTITIES = create(key("hurts_water_sensitive_entities"));
+
+    /**
+     * {@code #minecraft:rehydrates_axolotls}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<PotionType> REHYDRATES_AXOLOTLS = create(key("rehydrates_axolotls"));
+
+    /**
+     * {@code #minecraft:tradeable}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<PotionType> TRADEABLE = create(key("tradeable"));
+
+    private PotionTypeTagKeys() {
+    }
+
+    /**
+     * Creates a tag key for {@link PotionType} in the registry {@code minecraft:potion}.
+     *
+     * @param key the tag key's key
+     * @return a new tag key
+     */
+    public static TagKey<PotionType> create(final Key key) {
+        return TagKey.create(RegistryKey.POTION, key);
+    }
+}

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

@@ -2,12 +2,11 @@ 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.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.tag.TagKey;
 import net.kyori.adventure.key.Key;
 import org.bukkit.generator.structure.Structure;
-import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
@@ -24,9 +23,15 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.5")
-@ApiStatus.Experimental
+@GeneratedClass
 public final class StructureTagKeys {
+    /**
+     * {@code #minecraft:abandoned_camp}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Structure> ABANDONED_CAMP = create(key("abandoned_camp"));
+
     /**
      * {@code #minecraft:cats_spawn_as_black}
      *
@@ -69,6 +74,83 @@ public final class StructureTagKeys {
      */
     public static final TagKey<Structure> OCEAN_RUIN = create(key("ocean_ruin"));
 
+    /**
+     * {@code #minecraft:on_abandoned_camp_bamboo_jungle}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Structure> ON_ABANDONED_CAMP_BAMBOO_JUNGLE = create(key("on_abandoned_camp_bamboo_jungle"));
+
+    /**
+     * {@code #minecraft:on_abandoned_camp_birch_forest}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Structure> ON_ABANDONED_CAMP_BIRCH_FOREST = create(key("on_abandoned_camp_birch_forest"));
+
+    /**
+     * {@code #minecraft:on_abandoned_camp_cherry_grove}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Structure> ON_ABANDONED_CAMP_CHERRY_GROVE = create(key("on_abandoned_camp_cherry_grove"));
+
+    /**
+     * {@code #minecraft:on_abandoned_camp_dappled_forest}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Structure> ON_ABANDONED_CAMP_DAPPLED_FOREST = create(key("on_abandoned_camp_dappled_forest"));
+
+    /**
+     * {@code #minecraft:on_abandoned_camp_flower_forest}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Structure> ON_ABANDONED_CAMP_FLOWER_FOREST = create(key("on_abandoned_camp_flower_forest"));
+
+    /**
+     * {@code #minecraft:on_abandoned_camp_pale_garden}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Structure> ON_ABANDONED_CAMP_PALE_GARDEN = create(key("on_abandoned_camp_pale_garden"));
+
+    /**
+     * {@code #minecraft:on_abandoned_camp_swamp}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Structure> ON_ABANDONED_CAMP_SWAMP = create(key("on_abandoned_camp_swamp"));
+
+    /**
+     * {@code #minecraft:on_abandoned_camp_windswept_forest}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Structure> ON_ABANDONED_CAMP_WINDSWEPT_FOREST = create(key("on_abandoned_camp_windswept_forest"));
+
+    /**
+     * {@code #minecraft:on_ancient_city_maps}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Structure> ON_ANCIENT_CITY_MAPS = create(key("on_ancient_city_maps"));
+
+    /**
+     * {@code #minecraft:on_buried_trial_chambers_maps}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Structure> ON_BURIED_TRIAL_CHAMBERS_MAPS = create(key("on_buried_trial_chambers_maps"));
+
+    /**
+     * {@code #minecraft:on_desert_pyramid_maps}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Structure> ON_DESERT_PYRAMID_MAPS = create(key("on_desert_pyramid_maps"));
+
     /**
      * {@code #minecraft:on_desert_village_maps}
      *
@@ -77,18 +159,32 @@ public final class StructureTagKeys {
     public static final TagKey<Structure> ON_DESERT_VILLAGE_MAPS = create(key("on_desert_village_maps"));
 
     /**
-     * {@code #minecraft:on_jungle_explorer_maps}
+     * {@code #minecraft:on_jungle_pyramid_maps}
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    public static final TagKey<Structure> ON_JUNGLE_EXPLORER_MAPS = create(key("on_jungle_explorer_maps"));
+    public static final TagKey<Structure> ON_JUNGLE_PYRAMID_MAPS = create(key("on_jungle_pyramid_maps"));
 
     /**
-     * {@code #minecraft:on_ocean_explorer_maps}
+     * {@code #minecraft:on_mineshaft_maps}
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    public static final TagKey<Structure> ON_OCEAN_EXPLORER_MAPS = create(key("on_ocean_explorer_maps"));
+    public static final TagKey<Structure> ON_MINESHAFT_MAPS = create(key("on_mineshaft_maps"));
+
+    /**
+     * {@code #minecraft:on_ocean_monument_maps}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Structure> ON_OCEAN_MONUMENT_MAPS = create(key("on_ocean_monument_maps"));
+
+    /**
+     * {@code #minecraft:on_ocean_ruin_warm_maps}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<Structure> ON_OCEAN_RUIN_WARM_MAPS = create(key("on_ocean_ruin_warm_maps"));
 
     /**
      * {@code #minecraft:on_plains_village_maps}
@@ -112,11 +208,11 @@ public final class StructureTagKeys {
     public static final TagKey<Structure> ON_SNOWY_VILLAGE_MAPS = create(key("on_snowy_village_maps"));
 
     /**
-     * {@code #minecraft:on_swamp_explorer_maps}
+     * {@code #minecraft:on_swamp_hut_maps}
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    public static final TagKey<Structure> ON_SWAMP_EXPLORER_MAPS = create(key("on_swamp_explorer_maps"));
+    public static final TagKey<Structure> ON_SWAMP_HUT_MAPS = create(key("on_swamp_hut_maps"));
 
     /**
      * {@code #minecraft:on_taiga_village_maps}
@@ -133,18 +229,11 @@ public final class StructureTagKeys {
     public static final TagKey<Structure> ON_TREASURE_MAPS = create(key("on_treasure_maps"));
 
     /**
-     * {@code #minecraft:on_trial_chambers_maps}
+     * {@code #minecraft:on_woodland_mansion_maps}
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    public static final TagKey<Structure> ON_TRIAL_CHAMBERS_MAPS = create(key("on_trial_chambers_maps"));
-
-    /**
-     * {@code #minecraft:on_woodland_explorer_maps}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TagKey<Structure> ON_WOODLAND_EXPLORER_MAPS = create(key("on_woodland_explorer_maps"));
+    public static final TagKey<Structure> ON_WOODLAND_MANSION_MAPS = create(key("on_woodland_mansion_maps"));
 
     /**
      * {@code #minecraft:ruined_portal}
@@ -176,7 +265,6 @@ public final class StructureTagKeys {
      * @param key the tag key's key
      * @return a new tag key
      */
-    @ApiStatus.Experimental
     public static TagKey<Structure> create(final Key key) {
         return TagKey.create(RegistryKey.STRUCTURE, key);
     }

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

@@ -80,7 +80,7 @@ public class TimedEventExecutor implements EventExecutor {
             executor.execute(listener, event);
             return;
         }
-        try (Timing ignored = timings.startTiming()){
+        try (Timing ignored = timings.startTiming()) {
             executor.execute(listener, event);
         }
     }

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

@@ -51,8 +51,7 @@ import static co.aikar.timings.TimingsManager.MINUTE_REPORTS;
 import static co.aikar.util.JSONUtil.*;
 
 /**
- * Internal.
- *
+ * @hidden
  * @deprecated Timings will be removed in the future
  */
 @Deprecated(forRemoval = true)
@@ -135,7 +134,7 @@ public class TimingHistory {
                     }
                 }
                 return pair(
-                    worldMap.get(world.getName()),
+                    worldMap.get(world.key().asString()),
                     toArrayMapper(regions.values(),new Function<RegionData, Object>() {
                         @NotNull
                         @Override

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

@@ -2,6 +2,10 @@ package co.aikar.timings;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
+import net.kyori.adventure.audience.ForwardingAudience;
+import net.kyori.adventure.chat.ChatType;
+import net.kyori.adventure.chat.SignedMessage;
+import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.ConsoleCommandSender;
@@ -61,8 +65,18 @@ public class TimingsReportListener implements net.kyori.adventure.audience.Forwa
     }
 
     @Override
-    public void sendMessage(final @NotNull net.kyori.adventure.identity.Identity source, final @NotNull net.kyori.adventure.text.Component message, final @NotNull net.kyori.adventure.audience.MessageType type) {
-        net.kyori.adventure.audience.ForwardingAudience.super.sendMessage(source, message, type);
+    public void sendMessage(final @NotNull Component message) {
+        ForwardingAudience.super.sendMessage(message);
+    }
+
+    @Override
+    public void sendMessage(final @NotNull Component message, final ChatType.@NotNull Bound boundChatType) {
+        ForwardingAudience.super.sendMessage(message, boundChatType);
+    }
+
+    @Override
+    public void sendMessage(final @NotNull SignedMessage signedMessage, final ChatType.@NotNull Bound boundChatType) {
+        ForwardingAudience.super.sendMessage(signedMessage, boundChatType);
     }
 
     @NotNull

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

@@ -82,9 +82,9 @@ public class LoadingMap <K, V> extends AbstractMap<K, V> {
     /**
      * Creates a LoadingMap with an auto instantiating loader.
      *
-     * Will auto construct class of of Value when not found
+     * Will auto construct class of Value when not found
      *
-     * Since this uses Reflection, It is more effecient to define your own static loader
+     * Since this uses Reflection, It is more efficient to define your own static loader
      * than using this helper, but if performance is not critical, this is easier.
      *
      * @param backingMap Actual map being used.
@@ -102,9 +102,9 @@ public class LoadingMap <K, V> extends AbstractMap<K, V> {
     /**
      * Creates a LoadingMap with an auto instantiating loader.
      *
-     * Will auto construct class of of Value when not found
+     * Will auto construct class of Value when not found
      *
-     * Since this uses Reflection, It is more effecient to define your own static loader
+     * Since this uses Reflection, It is more efficient to define your own static loader
      * than using this helper, but if performance is not critical, this is easier.
      *
      * @param backingMap Actual map being used.
@@ -178,7 +178,7 @@ public class LoadingMap <K, V> extends AbstractMap<K, V> {
      * @param loadFactor Load factor to use
      * @param <K> Key Type of the Map
      * @param <V> Value Type of the Map
-     * @return  Map that auto instantiates on .get()
+     * @return Map that auto instantiates on .get()
      */
     @NotNull
     public static <K, V> Map<K, V> newHashAutoMap(@NotNull final Class<? extends V> valueClass, int initialCapacity, float loadFactor) {

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

@@ -1,5 +1,6 @@
 package com.destroystokyo.paper;
 
+import java.util.Locale;
 import net.kyori.adventure.translation.Translatable;
 import net.kyori.adventure.util.Index;
 import org.bukkit.inventory.MainHand;
@@ -29,9 +30,11 @@ public final class ClientOption<T> {
     }
 
     public enum ChatVisibility implements Translatable {
-        FULL("full"),
-        SYSTEM("system"),
-        HIDDEN("hidden"),
+        // Start generate - ChatVisibility
+        FULL("options.chat.visibility.full"),
+        SYSTEM("options.chat.visibility.system"),
+        HIDDEN("options.chat.visibility.hidden"),
+        // End generate - ChatVisibility
         /**
          * @deprecated no longer used anymore since 1.15.2, the value fallback
          * to the default value of the setting when unknown on the server.
@@ -40,37 +43,39 @@ public final class ClientOption<T> {
         @Deprecated(since = "1.15.2", forRemoval = true)
         UNKNOWN("unknown");
 
-        public static final Index<String, ChatVisibility> NAMES = Index.create(ChatVisibility.class, chatVisibility -> chatVisibility.name);
-        private final String name;
+        public static final Index<String, ChatVisibility> NAMES = Index.create(ChatVisibility.class, chatVisibility -> chatVisibility.name().toLowerCase(Locale.ENGLISH));
+        private final String translationKey;
 
-        ChatVisibility(final String name) {
-            this.name = name;
+        ChatVisibility(final String translationKey) {
+            this.translationKey = translationKey;
         }
 
         @Override
         public String translationKey() {
             if (this == UNKNOWN) {
-                throw new UnsupportedOperationException(this.name + " doesn't have a translation key");
+                throw new UnsupportedOperationException(this.name() + " doesn't have a translation key");
             }
-            return "options.chat.visibility." + this.name;
+            return this.translationKey;
         }
     }
 
     public enum ParticleVisibility implements Translatable {
-        ALL("all"),
-        DECREASED("decreased"),
-        MINIMAL("minimal");
+        // Start generate - ParticleVisibility
+        ALL("options.particles.all"),
+        DECREASED("options.particles.decreased"),
+        MINIMAL("options.particles.minimal");
+        // End generate - ParticleVisibility
 
-        public static final Index<String, ParticleVisibility> NAMES = Index.create(ParticleVisibility.class, particleVisibility -> particleVisibility.name);
-        private final String name;
+        public static final Index<String, ParticleVisibility> NAMES = Index.create(ParticleVisibility.class, particleVisibility -> particleVisibility.name().toLowerCase(Locale.ENGLISH));
+        private final String translationKey;
 
-        ParticleVisibility(final String name) {
-            this.name = name;
+        ParticleVisibility(final String translationKey) {
+            this.translationKey = translationKey;
         }
 
         @Override
         public String translationKey() {
-            return "options.particles." + this.name;
+            return this.translationKey;
         }
     }
 }

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

@@ -6,18 +6,17 @@ package com.destroystokyo.paper;
 
 import com.google.common.collect.Lists;
 import io.papermc.paper.tag.BaseTag;
+import java.util.Collection;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.inventory.ItemStack;
-
-import java.util.Collection;
-import java.util.Set;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -94,7 +93,8 @@ public class MaterialSetTag extends BaseTag<Material, MaterialSetTag> {
         return isTagged(item.getType());
     }
 
+    @Override
     public boolean isTagged(@NotNull Material material) {
-        return this.tagged.contains(material);
+        return super.isTagged(material);
     }
 }

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

@@ -23,6 +23,7 @@
 
 package com.destroystokyo.paper;
 
+import java.util.Objects;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.Tag;
@@ -38,32 +39,47 @@ import org.bukkit.Tag;
 public class MaterialTags {
 
     private static NamespacedKey keyFor(String key) {
-        //noinspection deprecation
         return new NamespacedKey("paper", key + "_settag");
     }
-    public static final MaterialSetTag ARROWS = new MaterialSetTag(keyFor("arrows"))
-        .endsWith("ARROW")
-        .ensureSize("ARROWS", 3).lock();
+
+    private static MaterialSetTag replacedBy(Tag<Material> vanillaTag) {
+        return replacedBy(vanillaTag, Objects.requireNonNull(vanillaTag).key().value());
+    }
+
+    @SuppressWarnings("unchecked")
+    private static MaterialSetTag replacedBy(Tag<Material> vanillaTag, String legacyKey) {
+        Objects.requireNonNull(vanillaTag);
+        return new MaterialSetTag(keyFor(legacyKey)).add(vanillaTag).lock();
+    }
+
+    /**
+     * @deprecated in favour of {@link Tag#ITEMS_ARROWS}
+     */
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag ARROWS = replacedBy(Tag.ITEMS_ARROWS);
 
     /**
      * Covers all colors of beds.
+     *
+     * @deprecated in favour of {@link Tag#BEDS}
      */
-    public static final MaterialSetTag BEDS = new MaterialSetTag(keyFor("beds"))
-        .endsWith("_BED")
-        .ensureSize("BEDS", 16).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag BEDS = replacedBy(Tag.BEDS);
 
     /**
      * Covers all bucket items.
      */
     public static final MaterialSetTag BUCKETS = new MaterialSetTag(keyFor("buckets"))
         .endsWith("BUCKET")
-        .ensureSize("BUCKETS", 11).lock();
+        .ensureSize("BUCKETS", 12).lock();
 
     /**
      * Covers coal and charcoal.
+     *
+     * @deprecated in favour of {@link Tag#ITEMS_COALS}
      */
-    public static final MaterialSetTag COALS = new MaterialSetTag(keyFor("coals"))
-        .add(Material.COAL, Material.CHARCOAL).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag COALS = replacedBy(Tag.ITEMS_COALS);
 
     /**
      * Covers both cobblestone wall variants.
@@ -80,17 +96,19 @@ public class MaterialTags {
 
     /**
      * Covers all colors of concrete.
+     *
+     * @deprecated in favour of {@link Tag#CONCRETE}
      */
-    public static final MaterialSetTag CONCRETES = new MaterialSetTag(keyFor("concretes"))
-        .endsWith("_CONCRETE")
-        .ensureSize("CONCRETES", 16).lock();
+    @Deprecated(since = "26.2")
+    public static final MaterialSetTag CONCRETES = replacedBy(Tag.CONCRETE, "concretes");
 
     /**
      * Covers all colors of concrete powder.
+     *
+     * @deprecated in favour of {@link Tag#CONCRETE_POWDERS}
      */
-    public static final MaterialSetTag CONCRETE_POWDER = new MaterialSetTag(keyFor("concrete_powder"))
-        .endsWith("_CONCRETE_POWDER")
-        .ensureSize("CONCRETE_POWDER", 16).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag CONCRETE_POWDER = replacedBy(Tag.CONCRETE_POWDERS);
 
     /**
      * Covers the two types of cooked fish.
@@ -100,31 +118,35 @@ public class MaterialTags {
 
     /**
      * Covers all variants of doors.
+     *
+     * @deprecated in favour of {@link Tag#DOORS}
      */
-    public static final MaterialSetTag DOORS = new MaterialSetTag(keyFor("doors"))
-        .endsWith("_DOOR")
-        .ensureSize("DOORS", 21).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag DOORS = replacedBy(Tag.DOORS);
 
     /**
      * Covers all dyes.
+     *
+     * @deprecated in favour of {@link Tag#ITEMS_DYES}
      */
-    public static final MaterialSetTag DYES = new MaterialSetTag(keyFor("dyes"))
-        .endsWith("_DYE")
-        .ensureSize("DYES", 16).lock();
+    @Deprecated(since = "26.1")
+    public static final MaterialSetTag DYES = replacedBy(Tag.ITEMS_DYES);
 
     /**
      * Covers all variants of gates.
+     *
+     * @deprecated in favour of {@link Tag#FENCE_GATES}
      */
-    public static final MaterialSetTag FENCE_GATES = new MaterialSetTag(keyFor("fence_gates"))
-        .endsWith("_GATE")
-        .ensureSize("FENCE_GATES", 12).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag FENCE_GATES = replacedBy(Tag.FENCE_GATES);
 
     /**
      * Covers all variants of fences.
+     *
+     * @deprecated in favour of {@link Tag#FENCES}
      */
-    public static final MaterialSetTag FENCES = new MaterialSetTag(keyFor("fences"))
-        .endsWith("_FENCE")
-        .ensureSize("FENCES", 13).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag FENCES = replacedBy(Tag.FENCES);
 
     /**
      * Covers all variants of fish buckets.
@@ -133,7 +155,7 @@ public class MaterialTags {
         .add(Material.COD_BUCKET, Material.PUFFERFISH_BUCKET, Material.SALMON_BUCKET, Material.TROPICAL_FISH_BUCKET).lock();
 
     /**
-     * Covers the non-colored glass and 16 stained glass (not panes).
+     * Covers the non-colored glass and 16 stained glasses (not panes).
      */
     public static final MaterialSetTag GLASS = new MaterialSetTag(keyFor("glass"))
         .endsWith("_GLASS")
@@ -149,10 +171,11 @@ public class MaterialTags {
 
     /**
      * Covers all glazed terracotta blocks.
+     *
+     * @deprecated in favour of {@link Tag#GLAZED_TERRACOTTA}
      */
-    public static final MaterialSetTag GLAZED_TERRACOTTA = new MaterialSetTag(keyFor("glazed_terracotta"))
-        .endsWith("GLAZED_TERRACOTTA")
-        .ensureSize("GLAZED_TERRACOTTA", 16).lock();
+    @Deprecated(since = "26.2")
+    public static final MaterialSetTag GLAZED_TERRACOTTA = replacedBy(Tag.GLAZED_TERRACOTTA);
 
     /**
      * Covers the colors of stained terracotta.
@@ -182,7 +205,7 @@ public class MaterialTags {
      */
     public static final MaterialSetTag HORSE_ARMORS = new MaterialSetTag(keyFor("horse_armors"))
         .endsWith("_HORSE_ARMOR")
-        .ensureSize("HORSE_ARMORS", 4).lock();
+        .ensureSize("HORSE_ARMORS", 6).lock();
 
     /**
      * Covers the variants of infested blocks.
@@ -201,23 +224,29 @@ public class MaterialTags {
 
     /**
      * Covers all mushrooms.
+     *
+     * @deprecated in favour of {@link Tag#ITEMS_MUSHROOMS}
      */
-    public static final MaterialSetTag MUSHROOMS = new MaterialSetTag(keyFor("mushrooms"))
-        .add(Material.BROWN_MUSHROOM, Material.RED_MUSHROOM).lock();
+    @Deprecated(since = "26.3")
+    public static final MaterialSetTag MUSHROOMS = replacedBy(Tag.ITEMS_MUSHROOMS);
 
     /**
      * Covers all music disc items.
      */
     public static final MaterialSetTag MUSIC_DISCS = new MaterialSetTag(keyFor("music_discs"))
-        .startsWith("MUSIC_DISC_").lock();
+        .startsWith("MUSIC_DISC_")
+        .ensureSize("MUSIC_DISCS", 22).lock();
 
     /**
      * Covers all ores.
+     *
+     * @deprecated in favour of {@link Tag#ORES}, makes sure to also check for ancient debris if you relied on this edge case
      */
+    @SuppressWarnings("unchecked")
+    @Deprecated(since = "26.3")
     public static final MaterialSetTag ORES = new MaterialSetTag(keyFor("ores"))
-        .add(Material.ANCIENT_DEBRIS)
-        .endsWith("_ORE")
-        .ensureSize("ORES", 19).lock();
+        .add(Tag.ORES)
+        .add(Material.ANCIENT_DEBRIS).lock();
 
     /**
      * Covers all piston typed items and blocks including the piston head and moving piston.
@@ -235,10 +264,11 @@ public class MaterialTags {
 
     /**
      * Covers all wooden pressure plates and the weighted pressure plates and the stone pressure plate.
+     *
+     * @deprecated in favour of {@link Tag#PRESSURE_PLATES}
      */
-    public static final MaterialSetTag PRESSURE_PLATES = new MaterialSetTag(keyFor("pressure_plates"))
-        .endsWith("_PRESSURE_PLATE")
-        .ensureSize("PRESSURE_PLATES", 16).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag PRESSURE_PLATES = replacedBy(Tag.PRESSURE_PLATES);
 
     /**
      * Covers the variants of prismarine blocks.
@@ -298,10 +328,11 @@ public class MaterialTags {
 
     /**
      * Covers the non-colored and colored shulker boxes.
+     *
+     * @deprecated in favour of {@link Tag#SHULKER_BOXES}
      */
-    public static final MaterialSetTag SHULKER_BOXES = new MaterialSetTag(keyFor("shulker_boxes"))
-        .endsWith("SHULKER_BOX")
-        .ensureSize("SHULKER_BOXES", 17).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag SHULKER_BOXES = replacedBy(Tag.SHULKER_BOXES);
 
     /**
      * Covers zombie, creeper, skeleton, dragon, and player heads.
@@ -317,7 +348,7 @@ public class MaterialTags {
      */
     public static final MaterialSetTag SPAWN_EGGS = new MaterialSetTag(keyFor("spawn_eggs"))
         .endsWith("_SPAWN_EGG")
-        .ensureSize("SPAWN_EGGS", 81).lock();
+        .ensureSize("SPAWN_EGGS", 88).lock();
 
     /**
      * Covers all colors of stained glass.
@@ -335,43 +366,43 @@ public class MaterialTags {
 
     /**
      * Covers all variants of trapdoors.
+     *
+     * @deprecated in favour of {@link Tag#TRAPDOORS}
      */
-    public static final MaterialSetTag TRAPDOORS = new MaterialSetTag(keyFor("trapdoors"))
-        .endsWith("_TRAPDOOR")
-        .ensureSize("TRAPDOORS", 21).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag TRAPDOORS = replacedBy(Tag.TRAPDOORS);
 
     /**
      * Covers all wood variants of doors.
+     *
+     * @deprecated in favour of {@link Tag#WOODEN_DOORS}
      */
-    public static final MaterialSetTag WOODEN_DOORS = new MaterialSetTag(keyFor("wooden_doors"))
-        .endsWith("_DOOR")
-        .not(Material.IRON_DOOR)
-        .notContains("COPPER")
-        .ensureSize("WOODEN_DOORS", 12).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag WOODEN_DOORS = replacedBy(Tag.WOODEN_DOORS);
 
     /**
      * Covers all wood variants of fences.
+     *
+     * @deprecated in favour of {@link Tag#WOODEN_FENCES}
      */
-    public static final MaterialSetTag WOODEN_FENCES = new MaterialSetTag(keyFor("wooden_fences"))
-        .endsWith("_FENCE")
-        .not(Material.NETHER_BRICK_FENCE)
-        .ensureSize("WOODEN_FENCES", 12).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag WOODEN_FENCES = replacedBy(Tag.WOODEN_FENCES);
 
     /**
      * Covers all wood variants of trapdoors.
+     *
+     * @deprecated in favour of {@link Tag#WOODEN_TRAPDOORS}
      */
-    public static final MaterialSetTag WOODEN_TRAPDOORS = new MaterialSetTag(keyFor("wooden_trapdoors"))
-        .endsWith("_TRAPDOOR")
-        .not(Material.IRON_TRAPDOOR)
-        .notContains("COPPER")
-        .ensureSize("WOODEN_TRAPDOORS", 12).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag WOODEN_TRAPDOORS = replacedBy(Tag.WOODEN_TRAPDOORS);
 
     /**
      * Covers the wood variants of gates.
+     *
+     * @deprecated in favour of {@link Tag#FENCE_GATES}
      */
-    public static final MaterialSetTag WOODEN_GATES = new MaterialSetTag(keyFor("wooden_gates"))
-        .endsWith("_GATE")
-        .ensureSize("WOODEN_GATES", 12).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag WOODEN_GATES = replacedBy(Tag.FENCE_GATES, "wooden_gates");
 
     /**
      * Covers the variants of purpur.
@@ -382,10 +413,11 @@ public class MaterialTags {
 
     /**
      * Covers the variants of signs.
+     *
+     * @deprecated in favour of {@link Tag#ALL_SIGNS}
      */
-    public static final MaterialSetTag SIGNS = new MaterialSetTag(keyFor("signs"))
-        .endsWith("_SIGN")
-        .ensureSize("SIGNS", 48).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag SIGNS = replacedBy(Tag.ALL_SIGNS, "signs");
 
     /**
      * Covers the variants of a regular torch.
@@ -408,112 +440,137 @@ public class MaterialTags {
         .add(Material.SOUL_TORCH, Material.SOUL_WALL_TORCH)
         .ensureSize("SOUL_TORCH", 2).lock();
 
+    /**
+     * Covers the variants of a copper torch.
+     */
+    public static final MaterialSetTag COPPER_TORCH = new MaterialSetTag(keyFor("copper_torch"))
+        .add(Material.COPPER_TORCH, Material.COPPER_WALL_TORCH)
+        .ensureSize("COPPER_TORCH", 2).lock();
+
     /**
      * Covers the variants of torches.
      */
     public static final MaterialSetTag TORCHES = new MaterialSetTag(keyFor("torches"))
-        .add(TORCH, REDSTONE_TORCH, SOUL_TORCH)
-        .ensureSize("TORCHES", 6).lock();
+        .add(TORCH, REDSTONE_TORCH, SOUL_TORCH, COPPER_TORCH)
+        .ensureSize("TORCHES", 8).lock();
 
     /**
      * Covers the variants of lanterns.
+     *
+     * @deprecated in favour of {@link Tag#LANTERNS}
      */
-    public static final MaterialSetTag LANTERNS = new MaterialSetTag(keyFor("lanterns"))
-        .add(Material.LANTERN, Material.SOUL_LANTERN)
-        .ensureSize("LANTERNS", 2).lock();
+    @Deprecated(since = "1.21.9")
+    public static final MaterialSetTag LANTERNS = replacedBy(Tag.LANTERNS);
 
     /**
      * Covers the variants of rails.
+     *
+     * @deprecated in favour of {@link Tag#RAILS}
      */
-    public static final MaterialSetTag RAILS = new MaterialSetTag(keyFor("rails"))
-        .endsWith("RAIL")
-        .ensureSize("RAILS", 4).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag RAILS = replacedBy(Tag.RAILS);
 
     /**
      * Covers the variants of swords.
+     *
+     * @deprecated in favour of {@link Tag#ITEMS_SWORDS}
      */
-    public static final MaterialSetTag SWORDS = new MaterialSetTag(keyFor("swords"))
-        .endsWith("_SWORD")
-        .ensureSize("SWORDS", 6).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag SWORDS = replacedBy(Tag.ITEMS_SWORDS);
 
     /**
      * Covers the variants of shovels.
+     *
+     * @deprecated in favour of {@link Tag#ITEMS_SHOVELS}
      */
-    public static final MaterialSetTag SHOVELS = new MaterialSetTag(keyFor("shovels"))
-        .endsWith("_SHOVEL")
-        .ensureSize("SHOVELS", 6).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag SHOVELS = replacedBy(Tag.ITEMS_SHOVELS);
 
     /**
      * Covers the variants of pickaxes.
+     *
+     * @deprecated in favour of {@link Tag#ITEMS_PICKAXES}
      */
-    public static final MaterialSetTag PICKAXES = new MaterialSetTag(keyFor("pickaxes"))
-        .endsWith("_PICKAXE")
-        .ensureSize("PICKAXES", 6).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag PICKAXES = replacedBy(Tag.ITEMS_PICKAXES);
 
     /**
      * Covers the variants of axes.
+     *
+     * @deprecated in favour of {@link Tag#ITEMS_AXES}
      */
-    public static final MaterialSetTag AXES = new MaterialSetTag(keyFor("axes"))
-        .endsWith("_AXE")
-        .ensureSize("AXES", 6).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag AXES = replacedBy(Tag.ITEMS_AXES);
 
     /**
      * Covers the variants of hoes.
+     *
+     * @deprecated in favour of {@link Tag#ITEMS_HOES}
      */
-    public static final MaterialSetTag HOES = new MaterialSetTag(keyFor("hoes"))
-        .endsWith("_HOE")
-        .ensureSize("HOES", 6).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag HOES = replacedBy(Tag.ITEMS_HOES);
 
     /**
      * Covers the variants of helmets.
+     *
+     * @deprecated in favour of {@link Tag#ITEMS_HEAD_ARMOR}
      */
-    public static final MaterialSetTag HELMETS = new MaterialSetTag(keyFor("helmets"))
-        .endsWith("_HELMET")
-        .ensureSize("HELMETS", 7).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag HELMETS = replacedBy(Tag.ITEMS_HEAD_ARMOR, "helmets");
 
     /**
      * Covers the variants of items that can be equipped in the helmet slot.
+     *
+     * @deprecated any item can be equippable with the right data component set on it
      */
+    @Deprecated(since = "1.21.8")
+    @SuppressWarnings("unchecked")
     public static final MaterialSetTag HEAD_EQUIPPABLE = new MaterialSetTag(keyFor("head_equippable"))
-        .endsWith("_HELMET")
-        .add(SKULLS)
-        .add(Material.CARVED_PUMPKIN)
-        .ensureSize("HEAD_EQUIPPABLE", 22).lock();
+        .add(Tag.ITEMS_HEAD_ARMOR, Tag.ITEMS_SKULLS)
+        .add(Material.CARVED_PUMPKIN).lock();
 
     /**
      * Covers the variants of chestplate.
+     *
+     * @deprecated in favour of {@link Tag#ITEMS_CHEST_ARMOR}
      */
-    public static final MaterialSetTag CHESTPLATES = new MaterialSetTag(keyFor("chestplates"))
-        .endsWith("_CHESTPLATE")
-        .ensureSize("CHESTPLATES", 6).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag CHESTPLATES = replacedBy(Tag.ITEMS_CHEST_ARMOR, "chestplates");
 
     /**
      * Covers the variants of items that can be equipped in the chest slot.
+     *
+     * @deprecated any item can be equippable with the right data component set on it
      */
+    @Deprecated(since = "1.21.8")
+    @SuppressWarnings("unchecked")
     public static final MaterialSetTag CHEST_EQUIPPABLE = new MaterialSetTag(keyFor("chest_equippable"))
-        .endsWith("_CHESTPLATE")
-        .add(Material.ELYTRA)
-        .ensureSize("CHEST_EQUIPPABLE", 7).lock();
+        .add(Tag.ITEMS_CHEST_ARMOR)
+        .add(Material.ELYTRA).lock();
 
     /**
      * Covers the variants of leggings.
+     *
+     * @deprecated in favour of {@link Tag#ITEMS_LEG_ARMOR}
      */
-    public static final MaterialSetTag LEGGINGS = new MaterialSetTag(keyFor("leggings"))
-        .endsWith("_LEGGINGS")
-        .ensureSize("LEGGINGS", 6).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag LEGGINGS = replacedBy(Tag.ITEMS_LEG_ARMOR, "leggings");
 
     /**
      * Covers the variants of boots.
+     *
+     * @deprecated in favour of {@link Tag#ITEMS_FOOT_ARMOR}
      */
-    public static final MaterialSetTag BOOTS = new MaterialSetTag(keyFor("boots"))
-        .endsWith("_BOOTS")
-        .ensureSize("BOOTS", 6).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag BOOTS = replacedBy(Tag.ITEMS_FOOT_ARMOR, "boots");
 
     /**
      * Covers all variants of armor.
      */
-    public static final MaterialSetTag ARMOR = new MaterialSetTag(keyFor("armor")).add(HELMETS, CHESTPLATES, LEGGINGS, BOOTS)
-        .ensureSize("ARMOR", 25).lock();
+    @SuppressWarnings("unchecked")
+    public static final MaterialSetTag ARMOR = new MaterialSetTag(keyFor("armor"))
+        .add(Tag.ITEMS_HEAD_ARMOR, Tag.ITEMS_CHEST_ARMOR, Tag.ITEMS_LEG_ARMOR, Tag.ITEMS_FOOT_ARMOR)
+        .lock();
 
     /**
      * Covers the variants of bows.
@@ -521,21 +578,29 @@ public class MaterialTags {
     public static final MaterialSetTag BOWS = new MaterialSetTag(keyFor("bows"))
         .add(Material.BOW)
         .add(Material.CROSSBOW)
-        .ensureSize("BOWS", 2).lock();
+        .lock();
 
     /**
      * Covers the variants of player-throwable projectiles (not requiring a bow or any other "assistance").
      */
+    @SuppressWarnings("unchecked")
     public static final MaterialSetTag THROWABLE_PROJECTILES = new MaterialSetTag(keyFor("throwable_projectiles"))
-        .add(Material.EGG, Material.SNOWBALL, Material.SPLASH_POTION, Material.TRIDENT, Material.ENDER_PEARL, Material.EXPERIENCE_BOTTLE, Material.FIREWORK_ROCKET).lock();
+        .add(Tag.ITEMS_EGGS)
+        .add(Material.SNOWBALL, Material.SPLASH_POTION, Material.LINGERING_POTION,
+            Material.TRIDENT, Material.ENDER_PEARL, Material.EXPERIENCE_BOTTLE, Material.FIREWORK_ROCKET,
+            Material.WIND_CHARGE)
+        .lock();
 
     /**
-     * Covers materials that can be colored, such as wool, shulker boxes, stained glass etc.
+     * Covers materials that can be colored, such as wool, shulker boxes, stained glasses etc.
      */
     @SuppressWarnings("unchecked")
     public static final MaterialSetTag COLORABLE = new MaterialSetTag(keyFor("colorable"))
-        .add(Tag.WOOL, Tag.CARPETS).add(SHULKER_BOXES, STAINED_GLASS, STAINED_GLASS_PANES, CONCRETES, BEDS).lock();
-    //.ensureSize("COLORABLE", 81).lock(); unit test don't have the vanilla item tags, so counts don't line up for real
+        .add(Tag.WOOL, Tag.WOOL_CARPETS, Tag.WOOL_SLABS, Tag.WOOL_STAIRS,
+            Tag.CONCRETE_SLABS, Tag.CONCRETE_STAIRS,
+            Tag.SHULKER_BOXES, Tag.BEDS, Tag.ITEMS_CUSHIONS)
+        .add(STAINED_GLASS, STAINED_GLASS_PANES)
+        .lock();
 
     /**
      * Covers the variants of coral.
@@ -561,15 +626,11 @@ public class MaterialTags {
 
     /**
      * Covers all items that can be enchanted from the enchantment table or anvil.
+     *
+     * @deprecated in favour of {@link Tag#ITEMS_ENCHANTABLE_VANISHING} and other similar enchantable tags
      */
-    public static final MaterialSetTag ENCHANTABLE = new MaterialSetTag(keyFor("enchantable"))
-        .add(PICKAXES, SWORDS, SHOVELS, AXES, HOES, HELMETS, CHEST_EQUIPPABLE, LEGGINGS, BOOTS, BOWS)
-        .add(Material.TRIDENT, Material.SHIELD, Material.FISHING_ROD, Material.SHEARS,
-            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)
-        .ensureSize("ENCHANTABLE", 76).lock();
+    @Deprecated(since = "1.21.8")
+    public static final MaterialSetTag ENCHANTABLE = replacedBy(Tag.ITEMS_ENCHANTABLE_VANISHING, "enchantable"); // this tag already cover the others
 
     /**
      * Covers the variants of raw ores.
@@ -601,19 +662,19 @@ public class MaterialTags {
      * Covers all oxidized copper blocks.
      */
     public static final MaterialSetTag OXIDIZED_COPPER_BLOCKS = new MaterialSetTag(keyFor("oxidized_copper_blocks"))
-        .startsWith("OXIDIZED_").startsWith("WAXED_OXIDIZED_").ensureSize("OXIDIZED_COPPER_BLOCKS", 18).lock();
+        .startsWith("OXIDIZED_").startsWith("WAXED_OXIDIZED_").ensureSize("OXIDIZED_COPPER_BLOCKS", 30).lock();
 
     /**
      * Covers all weathered copper blocks.
      */
     public static final MaterialSetTag WEATHERED_COPPER_BLOCKS = new MaterialSetTag(keyFor("weathered_copper_blocks"))
-        .startsWith("WEATHERED_").startsWith("WAXED_WEATHERED_").ensureSize("WEATHERED_COPPER_BLOCKS", 18).lock();
+        .startsWith("WEATHERED_").startsWith("WAXED_WEATHERED_").ensureSize("WEATHERED_COPPER_BLOCKS", 30).lock();
 
     /**
      * Covers all exposed copper blocks.
      */
     public static final MaterialSetTag EXPOSED_COPPER_BLOCKS = new MaterialSetTag(keyFor("exposed_copper_blocks"))
-        .startsWith("EXPOSED_").startsWith("WAXED_EXPOSED_").ensureSize("EXPOSED_COPPER_BLOCKS", 18).lock();
+        .startsWith("EXPOSED_").startsWith("WAXED_EXPOSED_").ensureSize("EXPOSED_COPPER_BLOCKS", 30).lock();
 
     /**
      * Covers all un-weathered copper blocks.
@@ -622,8 +683,12 @@ public class MaterialTags {
         .startsWith("CUT_COPPER").startsWith("WAXED_CUT_COPPER")
         .startsWith("WAXED_COPPER_").startsWith("COPPER_")
         .add(Material.CHISELED_COPPER, Material.WAXED_CHISELED_COPPER)
-        .not(Material.COPPER_INGOT, Material.COPPER_ORE)
-        .ensureSize("UNAFFECTED_COPPER_BLOCKS", 18).lock();
+        .not(Material.COPPER_INGOT, Material.COPPER_ORE, Material.COPPER_NUGGET)
+        .not(Material.COPPER_HORSE_ARMOR, Material.COPPER_GOLEM_SPAWN_EGG)
+        .not(Material.COPPER_HELMET, Material.COPPER_CHESTPLATE, Material.COPPER_LEGGINGS, Material.COPPER_BOOTS)
+        .not(Material.COPPER_AXE, Material.COPPER_HOE, Material.COPPER_PICKAXE, Material.COPPER_SHOVEL, Material.COPPER_SWORD)
+        .not(Material.COPPER_NAUTILUS_ARMOR, Material.COPPER_SPEAR)
+        .ensureSize("UNAFFECTED_COPPER_BLOCKS", 30).lock();
 
     /**
      * Covers all waxed copper blocks.
@@ -631,7 +696,7 @@ public class MaterialTags {
      * Combine with other copper-related tags to filter is-waxed or not.
      */
     public static final MaterialSetTag WAXED_COPPER_BLOCKS = new MaterialSetTag(keyFor("waxed_copper_blocks"))
-        .add(m -> m.name().startsWith("WAXED_") && m.name().contains("COPPER")).ensureSize("WAXED_COPPER_BLOCKS", 36).lock();
+        .add(m -> m.name().startsWith("WAXED_") && m.name().contains("COPPER")).ensureSize("WAXED_COPPER_BLOCKS", 56).lock();
 
     /**
      * Covers all un-waxed copper blocks.
@@ -642,13 +707,14 @@ public class MaterialTags {
         .startsWith("EXPOSED_").startsWith("WEATHERED_").startsWith("OXIDIZED_")
         .startsWith("CUT_COPPER")
         .add(Material.COPPER_BLOCK, Material.CHISELED_COPPER, Material.COPPER_DOOR, Material.COPPER_TRAPDOOR, Material.COPPER_GRATE, Material.COPPER_BULB)
-        .ensureSize("UNWAXED_COPPER_BLOCKS", 36).lock();
+        .add(Material.COPPER_BARS, Material.COPPER_TORCH, Material.COPPER_CHEST, Material.COPPER_CHAIN, Material.COPPER_WALL_TORCH, Material.COPPER_LANTERN, Material.COPPER_GOLEM_STATUE)
+        .ensureSize("UNWAXED_COPPER_BLOCKS", 61).lock();
 
     /**
      * Covers all copper block variants.
      */
     public static final MaterialSetTag COPPER_BLOCKS = new MaterialSetTag(keyFor("copper_blocks"))
-        .add(WAXED_COPPER_BLOCKS).add(UNWAXED_COPPER_BLOCKS).ensureSize("COPPER_BLOCKS", 72).lock();
+        .add(WAXED_COPPER_BLOCKS).add(UNWAXED_COPPER_BLOCKS).ensureSize("COPPER_BLOCKS", 117).lock();
 
     /**
      * Covers all weathering/waxed states of the plain copper block.
@@ -683,42 +749,49 @@ public class MaterialTags {
      * Covers all Wooden Tools.
      */
     public static final MaterialSetTag WOODEN_TOOLS = new MaterialSetTag(keyFor("wooden_tools"))
-        .add(Material.WOODEN_AXE, Material.WOODEN_HOE, Material.WOODEN_PICKAXE, Material.WOODEN_SHOVEL, Material.WOODEN_SWORD)
-        .ensureSize("WOODEN_TOOLS", 5).lock();
+        .add(Material.WOODEN_AXE, Material.WOODEN_HOE, Material.WOODEN_PICKAXE, Material.WOODEN_SHOVEL, Material.WOODEN_SWORD, Material.WOODEN_SPEAR)
+        .lock();
 
     /**
      * Covers all Stone Tools.
      */
     public static final MaterialSetTag STONE_TOOLS = new MaterialSetTag(keyFor("stone_tools"))
-        .add(Material.STONE_AXE, Material.STONE_HOE, Material.STONE_PICKAXE, Material.STONE_SHOVEL, Material.STONE_SWORD)
-        .ensureSize("STONE_TOOLS", 5).lock();
+        .add(Material.STONE_AXE, Material.STONE_HOE, Material.STONE_PICKAXE, Material.STONE_SHOVEL, Material.STONE_SWORD, Material.STONE_SPEAR)
+        .lock();
+
+    /**
+     * Covers all copper Tools.
+     */
+    public static final MaterialSetTag COPPER_TOOLS = new MaterialSetTag(keyFor("copper_tools"))
+        .add(Material.COPPER_AXE, Material.COPPER_HOE, Material.COPPER_PICKAXE, Material.COPPER_SHOVEL, Material.COPPER_SWORD, Material.COPPER_SPEAR)
+        .lock();
 
     /**
      * Covers all Iron Tools.
      */
     public static final MaterialSetTag IRON_TOOLS = new MaterialSetTag(keyFor("iron_tools"))
-        .add(Material.IRON_AXE, Material.IRON_HOE, Material.IRON_PICKAXE, Material.IRON_SHOVEL, Material.IRON_SWORD)
-        .ensureSize("IRON_TOOLS", 5).lock();
+        .add(Material.IRON_AXE, Material.IRON_HOE, Material.IRON_PICKAXE, Material.IRON_SHOVEL, Material.IRON_SWORD, Material.IRON_SPEAR)
+        .lock();
 
     /**
      * Covers all Gold Tools.
      */
     public static final MaterialSetTag GOLDEN_TOOLS = new MaterialSetTag(keyFor("golden_tools"))
-        .add(Material.GOLDEN_AXE, Material.GOLDEN_HOE, Material.GOLDEN_PICKAXE, Material.GOLDEN_SHOVEL, Material.GOLDEN_SWORD)
-        .ensureSize("GOLDEN_TOOLS", 5).lock();
+        .add(Material.GOLDEN_AXE, Material.GOLDEN_HOE, Material.GOLDEN_PICKAXE, Material.GOLDEN_SHOVEL, Material.GOLDEN_SWORD, Material.GOLDEN_SPEAR)
+        .lock();
 
     /**
      * Covers all Diamond Tools.
      */
     public static final MaterialSetTag DIAMOND_TOOLS = new MaterialSetTag(keyFor("diamond_tools"))
-        .add(Material.DIAMOND_AXE, Material.DIAMOND_HOE, Material.DIAMOND_PICKAXE, Material.DIAMOND_SHOVEL, Material.DIAMOND_SWORD)
-        .ensureSize("DIAMOND_TOOLS", 5).lock();
+        .add(Material.DIAMOND_AXE, Material.DIAMOND_HOE, Material.DIAMOND_PICKAXE, Material.DIAMOND_SHOVEL, Material.DIAMOND_SWORD, Material.DIAMOND_SPEAR)
+        .lock();
 
     /**
      * Covers all Netherite Tools.
      */
     public static final MaterialSetTag NETHERITE_TOOLS = new MaterialSetTag(keyFor("netherite_tools"))
-        .add(Material.NETHERITE_AXE, Material.NETHERITE_HOE, Material.NETHERITE_PICKAXE, Material.NETHERITE_SHOVEL, Material.NETHERITE_SWORD)
-        .ensureSize("NETHERITE_TOOLS", 5).lock();
+        .add(Material.NETHERITE_AXE, Material.NETHERITE_HOE, Material.NETHERITE_PICKAXE, Material.NETHERITE_SHOVEL, Material.NETHERITE_SWORD, Material.NETHERITE_SPEAR)
+        .lock();
 
 }

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

@@ -75,7 +75,7 @@ public final class NamespacedTag implements com.destroystokyo.paper.Namespaced {
         Preconditions.checkArgument(key != null, "Key cannot be null");
 
         this.namespace = plugin.getName().toLowerCase(Locale.ROOT);
-        this.key = key.toLowerCase().toLowerCase(Locale.ROOT);
+        this.key = key.toLowerCase(Locale.ROOT);
 
         // Check validity after normalization
         Preconditions.checkArgument(VALID_NAMESPACE.matcher(this.namespace).matches(), "Invalid namespace. Must be [a-z0-9._-]: %s", this.namespace);

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

@@ -17,7 +17,7 @@ import org.jspecify.annotations.Nullable;
 /**
  * Helps prepare a particle to be sent to players.
  * <p>
- * Usage of the builder is preferred over the super long {@link World#spawnParticle(Particle, Location, int, double, double, double, double, Object)} API
+ * Usage of the builder is preferred over the super long {@link World#spawnParticle(Particle, List, Player, double, double, double, int, double, double, double, double, double, double, Object, boolean, Particle.RandomizationType)} API.
  */
 @NullMarked
 public class ParticleBuilder implements Cloneable {
@@ -28,9 +28,10 @@ public class ParticleBuilder implements Cloneable {
     private @Nullable Location location;
     private int count = 1;
     private double offsetX = 0, offsetY = 0, offsetZ = 0;
-    private double extra = 1;
+    private double speedX = 1, speedY = 1, speedZ = 1;
     private @Nullable Object data;
     private boolean force = true;
+    private Particle.RandomizationType randomizationType = Particle.RandomizationType.DEFAULT;
 
     public ParticleBuilder(final Particle particle) {
         this.particle = particle;
@@ -49,7 +50,8 @@ public class ParticleBuilder implements Cloneable {
         this.location.getWorld().spawnParticle(
             this.particle, this.receivers, this.source,
             this.location.getX(), this.location.getY(), this.location.getZ(),
-            this.count, this.offsetX, this.offsetY, this.offsetZ, this.extra, this.data, this.force
+            this.count, this.offsetX, this.offsetY, this.offsetZ, this.speedX, this.speedY, this.speedZ,
+            this.data, this.force, this.randomizationType
         );
         return this;
     }
@@ -131,7 +133,7 @@ public class ParticleBuilder implements Cloneable {
      *                  world
      * @return a reference to this object.
      */
-    public ParticleBuilder receivers(final Player @Nullable... receivers) {
+    public ParticleBuilder receivers(final Player @Nullable ... receivers) {
         this.receivers = receivers != null ? Lists.newArrayList(receivers) : null;
         return this;
     }
@@ -165,8 +167,7 @@ public class ParticleBuilder implements Cloneable {
                 throw new IllegalStateException("Please set location first");
             }
             this.receivers = Lists.newArrayList();
-            for (final Player nearbyPlayer : this.location.getWorld()
-                .getNearbyPlayers(this.location, radius, radius, radius)) {
+            for (final Player nearbyPlayer : this.location.getWorld().getNearbyPlayers(this.location, radius, radius, radius)) {
                 final Location loc = nearbyPlayer.getLocation();
                 final double x = NumberConversions.square(this.location.getX() - loc.getX());
                 final double y = NumberConversions.square(this.location.getY() - loc.getY());
@@ -358,12 +359,14 @@ public class ParticleBuilder implements Cloneable {
     }
 
     /**
-     * Gets the Particle extra data. Varies by particle on how this is used
+     * Gets the Particle extra data (speedX). Varies by particle on how this is used
      *
      * @return the extra particle data
+     * @deprecated use one of the {@code speed} methods instead
      */
+    @Deprecated(since = "26.3", forRemoval = true)
     public double extra() {
-        return this.extra;
+        return this.speedX;
     }
 
     /**
@@ -371,9 +374,62 @@ public class ParticleBuilder implements Cloneable {
      *
      * @param extra the extra particle data
      * @return a reference to this object.
+     * @deprecated use {@link #speed(double)} instead
      */
+    @Deprecated(since = "26.3", forRemoval = true)
     public ParticleBuilder extra(final double extra) {
-        this.extra = extra;
+        return this.speed(extra);
+    }
+
+    /**
+     * Particle speed X. Varies by particle on how this is used
+     *
+     * @return the particle speed X
+     */
+    public double speedX() {
+        return this.speedX;
+    }
+
+    /**
+     * Particle speed Y. Varies by particle on how this is used
+     *
+     * @return the particle speed Y
+     */
+    public double speedY() {
+        return this.speedY;
+    }
+
+    /**
+     * Particle speed Z. Varies by particle on how this is used
+     *
+     * @return the particle speed Z
+     */
+    public double speedZ() {
+        return this.speedZ;
+    }
+
+    /**
+     * Sets the particle speed. Varies by particle on how this is used
+     *
+     * @param speed Particle speed
+     * @return a reference to this object.
+     */
+    public ParticleBuilder speed(final double speed) {
+        return this.speed(speed, speed, speed);
+    }
+
+    /**
+     * Sets the particle speed. Varies by particle on how this is used
+     *
+     * @param speedX Particle speed X
+     * @param speedY Particle speed Y
+     * @param speedZ Particle speed Z
+     * @return a reference to this object.
+     */
+    public ParticleBuilder speed(final double speedX, final double speedY, final double speedZ) {
+        this.speedX = speedX;
+        this.speedY = speedY;
+        this.speedZ = speedZ;
         return this;
     }
 
@@ -420,9 +476,29 @@ public class ParticleBuilder implements Cloneable {
         return this;
     }
 
+    /**
+     * Gets the randomization type for the particle. This determines how the particle's position and velocity are randomized.
+     *
+     * @return the randomization type for the particle
+     */
+    public Particle.RandomizationType randomizationType() {
+        return this.randomizationType;
+    }
+
+    /**
+     * Sets the randomization type for the particle. This determines how the particle's position and velocity are randomized.
+     *
+     * @param randomizationType the new randomization type for the particle
+     * @return a reference to this object.
+     */
+    public ParticleBuilder randomizationType(final Particle.RandomizationType randomizationType) {
+        this.randomizationType = randomizationType;
+        return this;
+    }
+
     /**
      * Sets the particle Color.
-     * Only valid for particles with a data type of {@link Color} or {@link Particle.DustOptions}.
+     * Only valid for particles with a data type of {@link Color}, {@link Particle.DustOptions} or {@link Particle.Spell}.
      *
      * @param color the new particle color
      * @return a reference to this object.
@@ -435,33 +511,37 @@ public class ParticleBuilder implements Cloneable {
     }
 
     /**
-     * Sets the particle Color and size.
-     * Only valid for particles with a data type of {@link Particle.DustOptions}.
+     * Sets the particle Color and size or power.
+     * Only valid for particles with a data type of {@link Particle.DustOptions} or {@link Particle.Spell}.
      *
      * @param color the new particle color
-     * @param size  the size of the particle
+     * @param value the size or power of the particle
      * @return a reference to this object.
      */
-    public ParticleBuilder color(final @Nullable Color color, final float size) {
-        if (this.particle.getDataType() != Particle.DustOptions.class && color != null) {
-            throw new IllegalStateException("The combination of Color and size cannot be set on this particle type.");
+    public ParticleBuilder color(final @Nullable Color color, final float value) {
+        if (this.particle.getDataType() != Particle.DustOptions.class && this.particle.getDataType() != Particle.Spell.class && color != null) {
+            throw new IllegalStateException("The combination of Color and float value cannot be set on this particle type.");
         }
 
         // We don't officially support reusing these objects, but here we go
         if (color == null) {
-            if (this.data instanceof Particle.DustOptions) {
+            if (this.data instanceof Particle.DustOptions || this.data instanceof Particle.Spell) {
                 return this.data(null);
             } else {
                 return this;
             }
         }
 
-        return this.data(new Particle.DustOptions(color, size));
+        if (this.particle.getDataType() == Particle.DustOptions.class) {
+            return this.data(new Particle.DustOptions(color, value));
+        } else {
+            return this.data(new Particle.Spell(color, value));
+        }
     }
 
     /**
      * Sets the particle Color.
-     * Only valid for particles with a data type of {@link Color} or {@link Particle.DustOptions}.
+     * Only valid for particles with a data type of {@link Color}, {@link Particle.DustOptions} or {@link Particle.Spell}.
      *
      * @param r red color component
      * @param g green color component
@@ -474,7 +554,7 @@ public class ParticleBuilder implements Cloneable {
 
     /**
      * Sets the particle Color.
-     * Only valid for particles with a data type of {@link Color} or {@link Particle.DustOptions}.
+     * Only valid for particles with a data type of {@link Color}, {@link Particle.DustOptions} or {@link Particle.Spell}.
      * <p>
      * This method detects if the provided color integer is in RGB or ARGB format.
      * If the alpha channel is zero, it treats the color as RGB. Otherwise, it treats it as ARGB.
@@ -493,7 +573,7 @@ public class ParticleBuilder implements Cloneable {
 
     /**
      * Sets the particle Color.
-     * Only valid for particles with a data type of {@link Color} or {@link Particle.DustOptions}.
+     * Only valid for particles with a data type of {@link Color}, {@link Particle.DustOptions} or {@link Particle.Spell}.
      *
      * @param a alpha color component
      * @param r red color component

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

@@ -1,7 +1,25 @@
 package com.destroystokyo.paper;
 
+import io.papermc.paper.InternalAPIBridge;
+import org.jetbrains.annotations.Contract;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Represents the different parts of a player's skin that can be toggled on or off.
+ */
+@NullMarked
 public interface SkinParts {
 
+    /**
+     * Creates a new instance of {@link SkinParts} with all parts enabled.
+     *
+     * @return a new {@link SkinParts} instance
+     */
+    @Contract(value = "-> new", pure = true)
+    static SkinParts.Mutable allParts() {
+        return InternalAPIBridge.get().allSkinParts();
+    }
+
     boolean hasCapeEnabled();
 
     boolean hasJacketEnabled();
@@ -17,4 +35,25 @@ public interface SkinParts {
     boolean hasHatsEnabled();
 
     int getRaw();
+
+    Mutable mutableCopy();
+
+    interface Mutable extends SkinParts {
+
+        void setCapeEnabled(boolean enabled);
+
+        void setJacketEnabled(boolean enabled);
+
+        void setLeftSleeveEnabled(boolean enabled);
+
+        void setRightSleeveEnabled(boolean enabled);
+
+        void setLeftPantsEnabled(boolean enabled);
+
+        void setRightPantsEnabled(boolean enabled);
+
+        void setHatsEnabled(boolean enabled);
+
+        SkinParts immutableCopy();
+    }
 }