We forget the tests

- Add missing Javadocs for ResolvableFloat and ResolvableInt
- Remove ignored components because they are implemented now

.checkstyle/checkstyle_base.xml

@@ -14,6 +14,7 @@
         <property name="messageKey" value="annotation\.same\.line"/>
         <property name="arguments" value="^(?!(${type_use_annotations}))"/>
     </module>
+    <module name="SuppressWarningsFilter"/>
 
     <!--Javadoc Comments-->
     <module name="JavadocPackage"/>
@@ -23,6 +24,7 @@
     <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"/>
@@ -55,7 +57,9 @@
         <module name="AvoidNoArgumentSuperConstructorCall"/>
         <module name="ConstructorsDeclarationGrouping"/>
         <module name="CovariantEquals"/>
-        <module name="DeclarationOrder"/>
+        <module name="DeclarationOrder">
+            <property name="ignoreConstructors" value="true"/>
+        </module>
         <module name="DefaultComesLast"/>
         <module name="EmptyStatement"/>
         <module name="EqualsHashCode"/>

README.md

@@ -1,4 +1,4 @@
-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.2*&label=version&color=%23344ceb
+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/build.yml?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)
@@ -39,7 +39,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly("io.papermc.paper:paper-api:26.2.build.+")
+    compileOnly("io.papermc.paper:paper-api:26.3.build.+")
 }
 
 java {
@@ -59,7 +59,7 @@ java {
 <dependency>
     <groupId>io.papermc.paper</groupId>
     <artifactId>paper-api</artifactId>
-    <version>[26.2.build,)</version>
+    <version>[26.3.build,)</version>
     <scope>provided</scope>
 </dependency>
 ```

build-data/paper.at

@@ -15,6 +15,8 @@ public net.minecraft.commands.CommandSourceStack source
 public net.minecraft.commands.arguments.DimensionArgument ERROR_INVALID_VALUE
 public net.minecraft.commands.arguments.blocks.BlockInput tag
 public net.minecraft.core.MappedRegistry validateWrite(Lnet/minecraft/resources/ResourceKey;)V
+public net.minecraft.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
@@ -27,7 +29,6 @@ public net.minecraft.resources.RegistryOps$HolderLookupAdapter
 public net.minecraft.server.Main forceUpgrade(Lnet/minecraft/world/level/storage/LevelStorageSource$LevelStorageAccess;Lcom/mojang/datafixers/DataFixer;ZLjava/util/function/BooleanSupplier;Lnet/minecraft/core/RegistryAccess;Z)V
 public net.minecraft.server.MinecraftServer LOGGER
 public net.minecraft.server.RegistryLayer STATIC_ACCESS
-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
@@ -76,6 +77,7 @@ public net.minecraft.server.level.ServerPlayer wardenSpawnTracker
 public net.minecraft.server.level.ServerPlayer$RespawnPosAngle
 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
@@ -120,6 +122,9 @@ 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.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;
@@ -335,8 +340,8 @@ 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.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.Guardian randomStrollGoal
 public net.minecraft.world.entity.monster.Guardian setActiveAttackTarget(I)V
@@ -370,15 +375,13 @@ public net.minecraft.world.entity.monster.piglin.AbstractPiglin isImmuneToZombif
 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 isChargingCrossbow()Z
-public net.minecraft.world.entity.monster.skeleton.Skeleton conversionTime
-public net.minecraft.world.entity.monster.skeleton.Skeleton inPowderSnowTime
+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.monster.zombie.Zombie DOOR_BREAKING_PREDICATE
-public net.minecraft.world.entity.monster.zombie.Zombie conversionTime
+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.Zombie startUnderWaterConversion(I)V
 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
@@ -488,7 +491,6 @@ 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.Ingredient values
-public net.minecraft.world.item.crafting.RecipeManager recipes
 public net.minecraft.world.item.crafting.RecipeMap byKey
 public net.minecraft.world.item.crafting.RecipeMap byType
 public net.minecraft.world.item.trading.MerchantOffer demand
@@ -523,14 +525,15 @@ 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.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.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
@@ -547,6 +550,7 @@ public net.minecraft.world.level.block.entity.BlockEntity saveId(Lnet/minecraft/
 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
@@ -621,21 +625,13 @@ public net.minecraft.world.level.dimension.end.EnderDragonFight spawnNewGateway(
 public net.minecraft.world.level.entity.PersistentEntitySectionManager ensureChunkQueuedForLoad(J)V
 public net.minecraft.world.level.entity.PersistentEntitySectionManager permanentStorage
 public net.minecraft.world.level.gamerules.GameRules rules
-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.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 resourceManagerSource
@@ -651,11 +647,13 @@ public net.minecraft.world.level.saveddata.maps.MapItemSavedData decorations
 public net.minecraft.world.level.storage.PrimaryLevelData settings
 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.ServerAdvancementManager advancements
 public-f net.minecraft.server.dedicated.DedicatedServer serverLinks
 public-f net.minecraft.server.dedicated.DedicatedServer settings
+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.Mob targetSelector
 public-f net.minecraft.world.entity.ai.attributes.RangedAttribute maxValue
@@ -666,6 +664,7 @@ public-f net.minecraft.world.inventory.AbstractContainerMenu lastSlots
 public-f net.minecraft.world.inventory.AbstractContainerMenu remoteDataSlots
 public-f net.minecraft.world.inventory.AbstractContainerMenu remoteSlots
 public-f net.minecraft.world.inventory.AbstractContainerMenu slots
+public-f net.minecraft.world.item.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

build.gradle.kts

@@ -4,7 +4,7 @@ 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.21" apply false
+    id("io.papermc.paperweight.core") version "2.0.0-beta.23" apply false
 }
 
 subprojects {

gradle.properties

@@ -1,9 +1,9 @@
 group=io.papermc.paper
-mcVersion=26.2
+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.2
-channel=STABLE
+apiVersion=26.3
+channel=ALPHA
 
 # Set to true while updating Minecraft version
 updatingMinecraft=false

paper-api/.checkstyle/checkstyle.xml

@@ -10,6 +10,11 @@
         <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"/>
@@ -20,7 +25,7 @@
         </module>
         <module name="MissingJavadocPackage"/>
         <module name="MissingJavadocType">
-            <property name="skipAnnotations" value="Generated, ApiStatus.Internal" />
+            <property name="skipAnnotations" value="Generated, ApiStatus.Internal"/>
         </module>
     </module>
 </module>

paper-api/build.gradle.kts

@@ -22,7 +22,7 @@ paperCheckstyle {
     directoriesToSkipFile = layout.projectDirectory.file(".checkstyle/ignored_directories.txt")
 }
 
-val annotationsVersion = "26.0.2"
+val annotationsVersion = "26.1.0"
 val adventureVersion = "5.2.0"
 val bungeeCordChatVersion = "1.21-R0.2-deprecated+build.21"
 val slf4jVersion = "2.0.17"
@@ -57,13 +57,11 @@ dependencies {
     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("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") {
@@ -89,7 +87,7 @@ dependencies {
     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)
 
@@ -207,7 +205,7 @@ tasks.withType<Javadoc>().configureEach {
         "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.8/",
+        "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.papermc.io/adventure/$adventureVersion/",

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

@@ -123,7 +123,7 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
 
     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);
 
@@ -171,7 +171,7 @@ 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);
 
@@ -181,6 +181,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
 
     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);

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

@@ -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}
      *

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

@@ -655,6 +655,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> BLACK_CONCRETE_POWDER = create(key("black_concrete_powder"));
 
+    /**
+     * {@code minecraft:black_concrete_slab}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> BLACK_CONCRETE_SLAB = create(key("black_concrete_slab"));
+
+    /**
+     * {@code minecraft:black_concrete_stairs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> BLACK_CONCRETE_STAIRS = create(key("black_concrete_stairs"));
+
     /**
      * {@code minecraft:black_glazed_terracotta}
      *
@@ -704,6 +718,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> BLACK_WOOL = create(key("black_wool"));
 
+    /**
+     * {@code minecraft:black_wool_slab}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> BLACK_WOOL_SLAB = create(key("black_wool_slab"));
+
+    /**
+     * {@code minecraft:black_wool_stairs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> BLACK_WOOL_STAIRS = create(key("black_wool_stairs"));
+
     /**
      * {@code minecraft:blackstone}
      *
@@ -788,6 +816,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> BLUE_CONCRETE_POWDER = create(key("blue_concrete_powder"));
 
+    /**
+     * {@code minecraft:blue_concrete_slab}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> BLUE_CONCRETE_SLAB = create(key("blue_concrete_slab"));
+
+    /**
+     * {@code minecraft:blue_concrete_stairs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> BLUE_CONCRETE_STAIRS = create(key("blue_concrete_stairs"));
+
     /**
      * {@code minecraft:blue_glazed_terracotta}
      *
@@ -851,6 +893,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> BLUE_WOOL = create(key("blue_wool"));
 
+    /**
+     * {@code minecraft:blue_wool_slab}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> BLUE_WOOL_SLAB = create(key("blue_wool_slab"));
+
+    /**
+     * {@code minecraft:blue_wool_stairs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> BLUE_WOOL_STAIRS = create(key("blue_wool_stairs"));
+
     /**
      * {@code minecraft:bone_block}
      *
@@ -977,6 +1033,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> BROWN_CONCRETE_POWDER = create(key("brown_concrete_powder"));
 
+    /**
+     * {@code minecraft:brown_concrete_slab}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> BROWN_CONCRETE_SLAB = create(key("brown_concrete_slab"));
+
+    /**
+     * {@code minecraft:brown_concrete_stairs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> BROWN_CONCRETE_STAIRS = create(key("brown_concrete_stairs"));
+
     /**
      * {@code minecraft:brown_glazed_terracotta}
      *
@@ -1040,6 +1110,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> BROWN_WOOL = create(key("brown_wool"));
 
+    /**
+     * {@code minecraft:brown_wool_slab}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> BROWN_WOOL_SLAB = create(key("brown_wool_slab"));
+
+    /**
+     * {@code minecraft:brown_wool_stairs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> BROWN_WOOL_STAIRS = create(key("brown_wool_stairs"));
+
     /**
      * {@code minecraft:bubble_column}
      *
@@ -2048,6 +2132,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> CYAN_CONCRETE_POWDER = create(key("cyan_concrete_powder"));
 
+    /**
+     * {@code minecraft:cyan_concrete_slab}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> CYAN_CONCRETE_SLAB = create(key("cyan_concrete_slab"));
+
+    /**
+     * {@code minecraft:cyan_concrete_stairs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> CYAN_CONCRETE_STAIRS = create(key("cyan_concrete_stairs"));
+
     /**
      * {@code minecraft:cyan_glazed_terracotta}
      *
@@ -2097,6 +2195,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> CYAN_WOOL = create(key("cyan_wool"));
 
+    /**
+     * {@code minecraft:cyan_wool_slab}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> CYAN_WOOL_SLAB = create(key("cyan_wool_slab"));
+
+    /**
+     * {@code minecraft:cyan_wool_stairs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> CYAN_WOOL_STAIRS = create(key("cyan_wool_stairs"));
+
     /**
      * {@code minecraft:damaged_anvil}
      *
@@ -3105,6 +3217,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> GRAY_CONCRETE_POWDER = create(key("gray_concrete_powder"));
 
+    /**
+     * {@code minecraft:gray_concrete_slab}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> GRAY_CONCRETE_SLAB = create(key("gray_concrete_slab"));
+
+    /**
+     * {@code minecraft:gray_concrete_stairs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> GRAY_CONCRETE_STAIRS = create(key("gray_concrete_stairs"));
+
     /**
      * {@code minecraft:gray_glazed_terracotta}
      *
@@ -3154,6 +3280,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> GRAY_WOOL = create(key("gray_wool"));
 
+    /**
+     * {@code minecraft:gray_wool_slab}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> GRAY_WOOL_SLAB = create(key("gray_wool_slab"));
+
+    /**
+     * {@code minecraft:gray_wool_stairs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> GRAY_WOOL_STAIRS = create(key("gray_wool_stairs"));
+
     /**
      * {@code minecraft:green_banner}
      *
@@ -3203,6 +3343,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> GREEN_CONCRETE_POWDER = create(key("green_concrete_powder"));
 
+    /**
+     * {@code minecraft:green_concrete_slab}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> GREEN_CONCRETE_SLAB = create(key("green_concrete_slab"));
+
+    /**
+     * {@code minecraft:green_concrete_stairs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> GREEN_CONCRETE_STAIRS = create(key("green_concrete_stairs"));
+
     /**
      * {@code minecraft:green_glazed_terracotta}
      *
@@ -3252,6 +3406,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> GREEN_WOOL = create(key("green_wool"));
 
+    /**
+     * {@code minecraft:green_wool_slab}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> GREEN_WOOL_SLAB = create(key("green_wool_slab"));
+
+    /**
+     * {@code minecraft:green_wool_stairs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> GREEN_WOOL_STAIRS = create(key("green_wool_stairs"));
+
     /**
      * {@code minecraft:grindstone}
      *
@@ -3728,6 +3896,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> LIGHT_BLUE_CONCRETE_POWDER = create(key("light_blue_concrete_powder"));
 
+    /**
+     * {@code minecraft:light_blue_concrete_slab}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> LIGHT_BLUE_CONCRETE_SLAB = create(key("light_blue_concrete_slab"));
+
+    /**
+     * {@code minecraft:light_blue_concrete_stairs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> LIGHT_BLUE_CONCRETE_STAIRS = create(key("light_blue_concrete_stairs"));
+
     /**
      * {@code minecraft:light_blue_glazed_terracotta}
      *
@@ -3777,6 +3959,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> LIGHT_BLUE_WOOL = create(key("light_blue_wool"));
 
+    /**
+     * {@code minecraft:light_blue_wool_slab}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> LIGHT_BLUE_WOOL_SLAB = create(key("light_blue_wool_slab"));
+
+    /**
+     * {@code minecraft:light_blue_wool_stairs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> LIGHT_BLUE_WOOL_STAIRS = create(key("light_blue_wool_stairs"));
+
     /**
      * {@code minecraft:light_gray_banner}
      *
@@ -3826,6 +4022,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> LIGHT_GRAY_CONCRETE_POWDER = create(key("light_gray_concrete_powder"));
 
+    /**
+     * {@code minecraft:light_gray_concrete_slab}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> LIGHT_GRAY_CONCRETE_SLAB = create(key("light_gray_concrete_slab"));
+
+    /**
+     * {@code minecraft:light_gray_concrete_stairs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> LIGHT_GRAY_CONCRETE_STAIRS = create(key("light_gray_concrete_stairs"));
+
     /**
      * {@code minecraft:light_gray_glazed_terracotta}
      *
@@ -3875,6 +4085,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> LIGHT_GRAY_WOOL = create(key("light_gray_wool"));
 
+    /**
+     * {@code minecraft:light_gray_wool_slab}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> LIGHT_GRAY_WOOL_SLAB = create(key("light_gray_wool_slab"));
+
+    /**
+     * {@code minecraft:light_gray_wool_stairs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> LIGHT_GRAY_WOOL_STAIRS = create(key("light_gray_wool_stairs"));
+
     /**
      * {@code minecraft:light_weighted_pressure_plate}
      *
@@ -3959,6 +4183,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> LIME_CONCRETE_POWDER = create(key("lime_concrete_powder"));
 
+    /**
+     * {@code minecraft:lime_concrete_slab}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> LIME_CONCRETE_SLAB = create(key("lime_concrete_slab"));
+
+    /**
+     * {@code minecraft:lime_concrete_stairs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> LIME_CONCRETE_STAIRS = create(key("lime_concrete_stairs"));
+
     /**
      * {@code minecraft:lime_glazed_terracotta}
      *
@@ -4008,6 +4246,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> LIME_WOOL = create(key("lime_wool"));
 
+    /**
+     * {@code minecraft:lime_wool_slab}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> LIME_WOOL_SLAB = create(key("lime_wool_slab"));
+
+    /**
+     * {@code minecraft:lime_wool_stairs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> LIME_WOOL_STAIRS = create(key("lime_wool_stairs"));
+
     /**
      * {@code minecraft:lodestone}
      *
@@ -4071,6 +4323,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> MAGENTA_CONCRETE_POWDER = create(key("magenta_concrete_powder"));
 
+    /**
+     * {@code minecraft:magenta_concrete_slab}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> MAGENTA_CONCRETE_SLAB = create(key("magenta_concrete_slab"));
+
+    /**
+     * {@code minecraft:magenta_concrete_stairs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> MAGENTA_CONCRETE_STAIRS = create(key("magenta_concrete_stairs"));
+
     /**
      * {@code minecraft:magenta_glazed_terracotta}
      *
@@ -4120,6 +4386,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> MAGENTA_WOOL = create(key("magenta_wool"));
 
+    /**
+     * {@code minecraft:magenta_wool_slab}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> MAGENTA_WOOL_SLAB = create(key("magenta_wool_slab"));
+
+    /**
+     * {@code minecraft:magenta_wool_stairs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> MAGENTA_WOOL_STAIRS = create(key("magenta_wool_stairs"));
+
     /**
      * {@code minecraft:magma_block}
      *
@@ -4715,6 +4995,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> ORANGE_CONCRETE_POWDER = create(key("orange_concrete_powder"));
 
+    /**
+     * {@code minecraft:orange_concrete_slab}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> ORANGE_CONCRETE_SLAB = create(key("orange_concrete_slab"));
+
+    /**
+     * {@code minecraft:orange_concrete_stairs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> ORANGE_CONCRETE_STAIRS = create(key("orange_concrete_stairs"));
+
     /**
      * {@code minecraft:orange_glazed_terracotta}
      *
@@ -4722,6 +5016,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> ORANGE_GLAZED_TERRACOTTA = create(key("orange_glazed_terracotta"));
 
+    /**
+     * {@code minecraft:orange_poplar_leaves}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> ORANGE_POPLAR_LEAVES = create(key("orange_poplar_leaves"));
+
     /**
      * {@code minecraft:orange_shulker_box}
      *
@@ -4771,6 +5072,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> ORANGE_WOOL = create(key("orange_wool"));
 
+    /**
+     * {@code minecraft:orange_wool_slab}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> ORANGE_WOOL_SLAB = create(key("orange_wool_slab"));
+
+    /**
+     * {@code minecraft:orange_wool_stairs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> ORANGE_WOOL_STAIRS = create(key("orange_wool_stairs"));
+
     /**
      * {@code minecraft:oxeye_daisy}
      *
@@ -5128,6 +5443,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> PINK_CONCRETE_POWDER = create(key("pink_concrete_powder"));
 
+    /**
+     * {@code minecraft:pink_concrete_slab}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> PINK_CONCRETE_SLAB = create(key("pink_concrete_slab"));
+
+    /**
+     * {@code minecraft:pink_concrete_stairs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> PINK_CONCRETE_STAIRS = create(key("pink_concrete_stairs"));
+
     /**
      * {@code minecraft:pink_glazed_terracotta}
      *
@@ -5191,6 +5520,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> PINK_WOOL = create(key("pink_wool"));
 
+    /**
+     * {@code minecraft:pink_wool_slab}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> PINK_WOOL_SLAB = create(key("pink_wool_slab"));
+
+    /**
+     * {@code minecraft:pink_wool_stairs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> PINK_WOOL_STAIRS = create(key("pink_wool_stairs"));
+
     /**
      * {@code minecraft:piston}
      *
@@ -5499,6 +5842,125 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> POLISHED_TUFF_WALL = create(key("polished_tuff_wall"));
 
+    /**
+     * {@code minecraft:poplar_button}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> POPLAR_BUTTON = create(key("poplar_button"));
+
+    /**
+     * {@code minecraft:poplar_door}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> POPLAR_DOOR = create(key("poplar_door"));
+
+    /**
+     * {@code minecraft:poplar_fence}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> POPLAR_FENCE = create(key("poplar_fence"));
+
+    /**
+     * {@code minecraft:poplar_fence_gate}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> POPLAR_FENCE_GATE = create(key("poplar_fence_gate"));
+
+    /**
+     * {@code minecraft:poplar_hanging_sign}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> POPLAR_HANGING_SIGN = create(key("poplar_hanging_sign"));
+
+    /**
+     * {@code minecraft:poplar_log}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> POPLAR_LOG = create(key("poplar_log"));
+
+    /**
+     * {@code minecraft:poplar_planks}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> POPLAR_PLANKS = create(key("poplar_planks"));
+
+    /**
+     * {@code minecraft:poplar_pressure_plate}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> POPLAR_PRESSURE_PLATE = create(key("poplar_pressure_plate"));
+
+    /**
+     * {@code minecraft:poplar_sapling}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> POPLAR_SAPLING = create(key("poplar_sapling"));
+
+    /**
+     * {@code minecraft:poplar_shelf}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> POPLAR_SHELF = create(key("poplar_shelf"));
+
+    /**
+     * {@code minecraft:poplar_sign}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> POPLAR_SIGN = create(key("poplar_sign"));
+
+    /**
+     * {@code minecraft:poplar_slab}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> POPLAR_SLAB = create(key("poplar_slab"));
+
+    /**
+     * {@code minecraft:poplar_stairs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> POPLAR_STAIRS = create(key("poplar_stairs"));
+
+    /**
+     * {@code minecraft:poplar_trapdoor}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> POPLAR_TRAPDOOR = create(key("poplar_trapdoor"));
+
+    /**
+     * {@code minecraft:poplar_wall_hanging_sign}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> POPLAR_WALL_HANGING_SIGN = create(key("poplar_wall_hanging_sign"));
+
+    /**
+     * {@code minecraft:poplar_wall_sign}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> POPLAR_WALL_SIGN = create(key("poplar_wall_sign"));
+
+    /**
+     * {@code minecraft:poplar_wood}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> POPLAR_WOOD = create(key("poplar_wood"));
+
     /**
      * {@code minecraft:poppy}
      *
@@ -5723,6 +6185,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> POTTED_PINK_TULIP = create(key("potted_pink_tulip"));
 
+    /**
+     * {@code minecraft:potted_poplar_sapling}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> POTTED_POPLAR_SAPLING = create(key("potted_poplar_sapling"));
+
     /**
      * {@code minecraft:potted_poppy}
      *
@@ -5919,6 +6388,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> PURPLE_CONCRETE_POWDER = create(key("purple_concrete_powder"));
 
+    /**
+     * {@code minecraft:purple_concrete_slab}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> PURPLE_CONCRETE_SLAB = create(key("purple_concrete_slab"));
+
+    /**
+     * {@code minecraft:purple_concrete_stairs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> PURPLE_CONCRETE_STAIRS = create(key("purple_concrete_stairs"));
+
     /**
      * {@code minecraft:purple_glazed_terracotta}
      *
@@ -5968,6 +6451,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> PURPLE_WOOL = create(key("purple_wool"));
 
+    /**
+     * {@code minecraft:purple_wool_slab}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> PURPLE_WOOL_SLAB = create(key("purple_wool_slab"));
+
+    /**
+     * {@code minecraft:purple_wool_stairs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> PURPLE_WOOL_STAIRS = create(key("purple_wool_stairs"));
+
     /**
      * {@code minecraft:purpur_block}
      *
@@ -6108,6 +6605,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> RED_CONCRETE_POWDER = create(key("red_concrete_powder"));
 
+    /**
+     * {@code minecraft:red_concrete_slab}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> RED_CONCRETE_SLAB = create(key("red_concrete_slab"));
+
+    /**
+     * {@code minecraft:red_concrete_stairs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> RED_CONCRETE_STAIRS = create(key("red_concrete_stairs"));
+
     /**
      * {@code minecraft:red_glazed_terracotta}
      *
@@ -6157,6 +6668,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> RED_NETHER_BRICKS = create(key("red_nether_bricks"));
 
+    /**
+     * {@code minecraft:red_poplar_leaves}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> RED_POPLAR_LEAVES = create(key("red_poplar_leaves"));
+
     /**
      * {@code minecraft:red_sand}
      *
@@ -6192,6 +6710,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> RED_SANDSTONE_WALL = create(key("red_sandstone_wall"));
 
+    /**
+     * {@code minecraft:red_shrub}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> RED_SHRUB = create(key("red_shrub"));
+
     /**
      * {@code minecraft:red_shulker_box}
      *
@@ -6241,6 +6766,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> RED_WOOL = create(key("red_wool"));
 
+    /**
+     * {@code minecraft:red_wool_slab}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> RED_WOOL_SLAB = create(key("red_wool_slab"));
+
+    /**
+     * {@code minecraft:red_wool_stairs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> RED_WOOL_STAIRS = create(key("red_wool_stairs"));
+
     /**
      * {@code minecraft:redstone_block}
      *
@@ -6465,6 +7004,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> SEAGRASS = create(key("seagrass"));
 
+    /**
+     * {@code minecraft:shelf_mushroom}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> SHELF_MUSHROOM = create(key("shelf_mushroom"));
+
     /**
      * {@code minecraft:short_dry_grass}
      *
@@ -6920,6 +7466,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> STONECUTTER = create(key("stonecutter"));
 
+    /**
+     * {@code minecraft:straw_bed}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> STRAW_BED = create(key("straw_bed"));
+
     /**
      * {@code minecraft:stripped_acacia_log}
      *
@@ -7053,6 +7606,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> STRIPPED_PALE_OAK_WOOD = create(key("stripped_pale_oak_wood"));
 
+    /**
+     * {@code minecraft:stripped_poplar_log}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> STRIPPED_POPLAR_LOG = create(key("stripped_poplar_log"));
+
+    /**
+     * {@code minecraft:stripped_poplar_wood}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> STRIPPED_POPLAR_WOOD = create(key("stripped_poplar_wood"));
+
     /**
      * {@code minecraft:stripped_spruce_log}
      *
@@ -8201,6 +8768,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> WHITE_CONCRETE_POWDER = create(key("white_concrete_powder"));
 
+    /**
+     * {@code minecraft:white_concrete_slab}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WHITE_CONCRETE_SLAB = create(key("white_concrete_slab"));
+
+    /**
+     * {@code minecraft:white_concrete_stairs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WHITE_CONCRETE_STAIRS = create(key("white_concrete_stairs"));
+
     /**
      * {@code minecraft:white_glazed_terracotta}
      *
@@ -8257,6 +8838,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> WHITE_WOOL = create(key("white_wool"));
 
+    /**
+     * {@code minecraft:white_wool_slab}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WHITE_WOOL_SLAB = create(key("white_wool_slab"));
+
+    /**
+     * {@code minecraft:white_wool_stairs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WHITE_WOOL_STAIRS = create(key("white_wool_stairs"));
+
     /**
      * {@code minecraft:wildflowers}
      *
@@ -8334,6 +8929,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> YELLOW_CONCRETE_POWDER = create(key("yellow_concrete_powder"));
 
+    /**
+     * {@code minecraft:yellow_concrete_slab}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> YELLOW_CONCRETE_SLAB = create(key("yellow_concrete_slab"));
+
+    /**
+     * {@code minecraft:yellow_concrete_stairs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> YELLOW_CONCRETE_STAIRS = create(key("yellow_concrete_stairs"));
+
     /**
      * {@code minecraft:yellow_glazed_terracotta}
      *
@@ -8341,6 +8950,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> YELLOW_GLAZED_TERRACOTTA = create(key("yellow_glazed_terracotta"));
 
+    /**
+     * {@code minecraft:yellow_poplar_leaves}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> YELLOW_POPLAR_LEAVES = create(key("yellow_poplar_leaves"));
+
     /**
      * {@code minecraft:yellow_shulker_box}
      *
@@ -8383,6 +8999,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> YELLOW_WOOL = create(key("yellow_wool"));
 
+    /**
+     * {@code minecraft:yellow_wool_slab}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> YELLOW_WOOL_SLAB = create(key("yellow_wool_slab"));
+
+    /**
+     * {@code minecraft:yellow_wool_stairs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> YELLOW_WOOL_STAIRS = create(key("yellow_wool_stairs"));
+
     /**
      * {@code minecraft:zombie_head}
      *

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

@@ -32,6 +32,13 @@ public final class DataComponentTypeKeys {
      */
     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}
      *
@@ -88,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}
      *
@@ -102,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}
      *
@@ -172,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}
      *
@@ -193,6 +221,13 @@ 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}
      *
@@ -214,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}
      *
@@ -382,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}
      *
@@ -438,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}
      *
@@ -487,6 +529,13 @@ public final class DataComponentTypeKeys {
      */
     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}
      *
@@ -578,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}
      *
@@ -641,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}
      *
@@ -662,13 +732,6 @@ public final class DataComponentTypeKeys {
      */
     public static final TypedKey<DataComponentType> SUSPICIOUS_STEW_EFFECTS = create(key("suspicious_stew_effects"));
 
-    /**
-     * {@code minecraft:swing_animation}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<DataComponentType> SWING_ANIMATION = create(key("swing_animation"));
-
     /**
      * {@code minecraft:tool}
      *
@@ -753,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}
      *

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/MapDecorationTypeKeys.java

@@ -25,6 +25,20 @@ import org.jspecify.annotations.NullMarked;
 @NullMarked
 @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/SoundEventKeys.java

@@ -4043,6 +4043,48 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> BLOCK_POLISHED_TUFF_STEP = create(key("block.polished_tuff.step"));
 
+    /**
+     * {@code minecraft:block.poplar_leaves.ambient}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_POPLAR_LEAVES_AMBIENT = create(key("block.poplar_leaves.ambient"));
+
+    /**
+     * {@code minecraft:block.poplar_leaves.break}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_POPLAR_LEAVES_BREAK = create(key("block.poplar_leaves.break"));
+
+    /**
+     * {@code minecraft:block.poplar_leaves.fall}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_POPLAR_LEAVES_FALL = create(key("block.poplar_leaves.fall"));
+
+    /**
+     * {@code minecraft:block.poplar_leaves.hit}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_POPLAR_LEAVES_HIT = create(key("block.poplar_leaves.hit"));
+
+    /**
+     * {@code minecraft:block.poplar_leaves.place}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_POPLAR_LEAVES_PLACE = create(key("block.poplar_leaves.place"));
+
+    /**
+     * {@code minecraft:block.poplar_leaves.step}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_POPLAR_LEAVES_STEP = create(key("block.poplar_leaves.step"));
+
     /**
      * {@code minecraft:block.portal.ambient}
      *
@@ -4176,6 +4218,20 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> BLOCK_PUMPKIN_CARVE = create(key("block.pumpkin.carve"));
 
+    /**
+     * {@code minecraft:block.red_shrub.break}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_RED_SHRUB_BREAK = create(key("block.red_shrub.break"));
+
+    /**
+     * {@code minecraft:block.red_shrub.place}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_RED_SHRUB_PLACE = create(key("block.red_shrub.place"));
+
     /**
      * {@code minecraft:block.redstone_torch.burnout}
      *
@@ -4715,6 +4771,41 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> BLOCK_SHELF_TAKE_ITEM = create(key("block.shelf.take_item"));
 
+    /**
+     * {@code minecraft:block.shelf_mushroom.bounce}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_SHELF_MUSHROOM_BOUNCE = create(key("block.shelf_mushroom.bounce"));
+
+    /**
+     * {@code minecraft:block.shelf_mushroom.break}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_SHELF_MUSHROOM_BREAK = create(key("block.shelf_mushroom.break"));
+
+    /**
+     * {@code minecraft:block.shelf_mushroom.fall}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_SHELF_MUSHROOM_FALL = create(key("block.shelf_mushroom.fall"));
+
+    /**
+     * {@code minecraft:block.shelf_mushroom.place}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_SHELF_MUSHROOM_PLACE = create(key("block.shelf_mushroom.place"));
+
+    /**
+     * {@code minecraft:block.shelf_mushroom.step}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_SHELF_MUSHROOM_STEP = create(key("block.shelf_mushroom.step"));
+
     /**
      * {@code minecraft:block.shroomlight.break}
      *
@@ -5205,6 +5296,48 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> BLOCK_STONE_PRESSURE_PLATE_CLICK_ON = create(key("block.stone_pressure_plate.click_on"));
 
+    /**
+     * {@code minecraft:block.straw_bed.break}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_STRAW_BED_BREAK = create(key("block.straw_bed.break"));
+
+    /**
+     * {@code minecraft:block.straw_bed.break_leave}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_STRAW_BED_BREAK_LEAVE = create(key("block.straw_bed.break_leave"));
+
+    /**
+     * {@code minecraft:block.straw_bed.fall}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_STRAW_BED_FALL = create(key("block.straw_bed.fall"));
+
+    /**
+     * {@code minecraft:block.straw_bed.hit}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_STRAW_BED_HIT = create(key("block.straw_bed.hit"));
+
+    /**
+     * {@code minecraft:block.straw_bed.place}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_STRAW_BED_PLACE = create(key("block.straw_bed.place"));
+
+    /**
+     * {@code minecraft:block.straw_bed.step}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_STRAW_BED_STEP = create(key("block.straw_bed.step"));
+
     /**
      * {@code minecraft:block.sulfur.break}
      *
@@ -7438,6 +7571,34 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> ENTITY_CREEPER_PRIMED = create(key("entity.creeper.primed"));
 
+    /**
+     * {@code minecraft:entity.cushion.break}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_CUSHION_BREAK = create(key("entity.cushion.break"));
+
+    /**
+     * {@code minecraft:entity.cushion.get_up}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_CUSHION_GET_UP = create(key("entity.cushion.get_up"));
+
+    /**
+     * {@code minecraft:entity.cushion.place}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_CUSHION_PLACE = create(key("entity.cushion.place"));
+
+    /**
+     * {@code minecraft:entity.cushion.sit}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_CUSHION_SIT = create(key("entity.cushion.sit"));
+
     /**
      * {@code minecraft:entity.dolphin.ambient}
      *

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

@@ -25,6 +25,132 @@ import org.jspecify.annotations.NullMarked;
 @NullMarked
 @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/tags/BiomeTagKeys.java

@@ -39,6 +39,132 @@ 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_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_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}
      *

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

@@ -207,6 +207,55 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> BIRCH_LOGS = create(key("birch_logs"));
 
+    /**
+     * {@code #minecraft:blocks_dolphin_jump}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> BLOCKS_DOLPHIN_JUMP = create(key("blocks_dolphin_jump"));
+
+    /**
+     * {@code #minecraft:blocks_fluid_flow}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> BLOCKS_FLUID_FLOW = create(key("blocks_fluid_flow"));
+
+    /**
+     * {@code #minecraft:blocks_lava_fire_spread}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> BLOCKS_LAVA_FIRE_SPREAD = create(key("blocks_lava_fire_spread"));
+
+    /**
+     * {@code #minecraft:blocks_motion}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> BLOCKS_MOTION = create(key("blocks_motion"));
+
+    /**
+     * {@code #minecraft:blocks_motion_in_heightmap}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> BLOCKS_MOTION_IN_HEIGHTMAP = create(key("blocks_motion_in_heightmap"));
+
+    /**
+     * {@code #minecraft:blocks_motion_in_heightmap_no_leaves}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> BLOCKS_MOTION_IN_HEIGHTMAP_NO_LEAVES = create(key("blocks_motion_in_heightmap_no_leaves"));
+
+    /**
+     * {@code #minecraft:blocks_motion_no_leaves}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> BLOCKS_MOTION_NO_LEAVES = create(key("blocks_motion_no_leaves"));
+
     /**
      * {@code #minecraft:blocks_wind_charge_explosions}
      *
@@ -263,6 +312,13 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> CANDLES = create(key("candles"));
 
+    /**
+     * {@code #minecraft:cannot_place_basalt_pillar_on}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> CANNOT_PLACE_BASALT_PILLAR_ON = create(key("cannot_place_basalt_pillar_on"));
+
     /**
      * {@code #minecraft:cannot_replace_below_tree_trunk}
      *
@@ -291,6 +347,27 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> CANNOT_SUPPORT_SNOW_LAYER = create(key("cannot_support_snow_layer"));
 
+    /**
+     * {@code #minecraft:cat_does_not_teleport_to}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> CAT_DOES_NOT_TELEPORT_TO = create(key("cat_does_not_teleport_to"));
+
+    /**
+     * {@code #minecraft:cats_can_lie_on}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> CATS_CAN_LIE_ON = create(key("cats_can_lie_on"));
+
+    /**
+     * {@code #minecraft:cats_can_sit_on}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> CATS_CAN_SIT_ON = create(key("cats_can_sit_on"));
+
     /**
      * {@code #minecraft:cauldrons}
      *
@@ -312,6 +389,13 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> CAUSES_PERIODIC_GEYSER_ERUPTIONS = create(key("causes_periodic_geyser_eruptions"));
 
+    /**
+     * {@code #minecraft:causes_suffocation}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> CAUSES_SUFFOCATION = create(key("causes_suffocation"));
+
     /**
      * {@code #minecraft:cave_vines}
      *
@@ -383,11 +467,32 @@ public final class BlockTypeTagKeys {
     public static final TagKey<BlockType> CONCRETE_POWDERS = create(key("concrete_powders"));
 
     /**
-     * {@code #minecraft:convertable_to_mud}
+     * {@code #minecraft:concrete_slabs}
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    public static final TagKey<BlockType> CONVERTABLE_TO_MUD = create(key("convertable_to_mud"));
+    public static final TagKey<BlockType> 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<BlockType> CONCRETE_STAIRS = create(key("concrete_stairs"));
+
+    /**
+     * {@code #minecraft:conduit_effect_block}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> CONDUIT_EFFECT_BLOCK = create(key("conduit_effect_block"));
+
+    /**
+     * {@code #minecraft:convertible_to_mud}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> CONVERTIBLE_TO_MUD = create(key("convertible_to_mud"));
 
     /**
      * {@code #minecraft:copper}
@@ -459,6 +564,13 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> CRYSTAL_SOUND_BLOCKS = create(key("crystal_sound_blocks"));
 
+    /**
+     * {@code #minecraft:cushion_uses_collision_shape}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> CUSHION_USES_COLLISION_SHAPE = create(key("cushion_uses_collision_shape"));
+
     /**
      * {@code #minecraft:dampens_vibrations}
      *
@@ -466,6 +578,13 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> DAMPENS_VIBRATIONS = create(key("dampens_vibrations"));
 
+    /**
+     * {@code #minecraft:dangerous_for_teleportation}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> DANGEROUS_FOR_TELEPORTATION = create(key("dangerous_for_teleportation"));
+
     /**
      * {@code #minecraft:dark_oak_logs}
      *
@@ -578,6 +697,13 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> ENCHANTMENT_POWER_TRANSMITTER = create(key("enchantment_power_transmitter"));
 
+    /**
+     * {@code #minecraft:enderman_does_not_teleport_to}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> ENDERMAN_DOES_NOT_TELEPORT_TO = create(key("enderman_does_not_teleport_to"));
+
     /**
      * {@code #minecraft:enderman_holdable}
      *
@@ -585,6 +711,13 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> ENDERMAN_HOLDABLE = create(key("enderman_holdable"));
 
+    /**
+     * {@code #minecraft:entities_can_teleport_to}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> ENTITIES_CAN_TELEPORT_TO = create(key("entities_can_teleport_to"));
+
     /**
      * {@code #minecraft:fall_damage_resetting}
      *
@@ -725,6 +858,13 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> HAPPY_GHAST_AVOIDS = create(key("happy_ghast_avoids"));
 
+    /**
+     * {@code #minecraft:height_specific_ore_replaceables}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> HEIGHT_SPECIFIC_ORE_REPLACEABLES = create(key("height_specific_ore_replaceables"));
+
     /**
      * {@code #minecraft:hoglin_repellents}
      *
@@ -753,6 +893,13 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> ICE = create(key("ice"));
 
+    /**
+     * {@code #minecraft:ice_melts_when_destroyed_above}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> ICE_MELTS_WHEN_DESTROYED_ABOVE = create(key("ice_melts_when_destroyed_above"));
+
     /**
      * {@code #minecraft:ice_spike_replaceable}
      *
@@ -1034,11 +1181,11 @@ public final class BlockTypeTagKeys {
     public static final TagKey<BlockType> NEEDS_STONE_TOOL = create(key("needs_stone_tool"));
 
     /**
-     * {@code #minecraft:nether_carver_replaceables}
+     * {@code #minecraft:nether_portal_frame}
      *
      * @apiNote This field is version-dependant and may be removed in future Minecraft versions
      */
-    public static final TagKey<BlockType> NETHER_CARVER_REPLACEABLES = create(key("nether_carver_replaceables"));
+    public static final TagKey<BlockType> NETHER_PORTAL_FRAME = create(key("nether_portal_frame"));
 
     /**
      * {@code #minecraft:nylium}
@@ -1061,6 +1208,13 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> OCCLUDES_VIBRATION_SIGNALS = create(key("occludes_vibration_signals"));
 
+    /**
+     * {@code #minecraft:ores}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> ORES = create(key("ores"));
+
     /**
      * {@code #minecraft:overrides_mushroom_light_requirement}
      *
@@ -1068,13 +1222,6 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> OVERRIDES_MUSHROOM_LIGHT_REQUIREMENT = create(key("overrides_mushroom_light_requirement"));
 
-    /**
-     * {@code #minecraft:overworld_carver_replaceables}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TagKey<BlockType> OVERWORLD_CARVER_REPLACEABLES = create(key("overworld_carver_replaceables"));
-
     /**
      * {@code #minecraft:overworld_natural_logs}
      *
@@ -1124,6 +1271,13 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> POLAR_BEARS_SPAWNABLE_ON_ALTERNATE = create(key("polar_bears_spawnable_on_alternate"));
 
+    /**
+     * {@code #minecraft:poplar_logs}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> POPLAR_LOGS = create(key("poplar_logs"));
+
     /**
      * {@code #minecraft:portals}
      *
@@ -1194,6 +1348,13 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> REPLACEABLE_BY_TREES = create(key("replaceable_by_trees"));
 
+    /**
+     * {@code #minecraft:required_for_poplar_leaf_ambience}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> REQUIRED_FOR_POPLAR_LEAF_AMBIENCE = create(key("required_for_poplar_leaf_ambience"));
+
     /**
      * {@code #minecraft:sand}
      *
@@ -1208,6 +1369,13 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> SAPLINGS = create(key("saplings"));
 
+    /**
+     * {@code #minecraft:sculk_growth_inhibitors}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> SCULK_GROWTH_INHIBITORS = create(key("sculk_growth_inhibitors"));
+
     /**
      * {@code #minecraft:sculk_replaceable}
      *
@@ -1250,6 +1418,13 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> SHULKER_BOXES = create(key("shulker_boxes"));
 
+    /**
+     * {@code #minecraft:shulker_does_not_teleport_to}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> SHULKER_DOES_NOT_TELEPORT_TO = create(key("shulker_does_not_teleport_to"));
+
     /**
      * {@code #minecraft:signs}
      *
@@ -1257,6 +1432,13 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> SIGNS = create(key("signs"));
 
+    /**
+     * {@code #minecraft:skulls}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> SKULLS = create(key("skulls"));
+
     /**
      * {@code #minecraft:slabs}
      *
@@ -1327,6 +1509,13 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> SOUL_SPEED_BLOCKS = create(key("soul_speed_blocks"));
 
+    /**
+     * {@code #minecraft:speeds_up_zombie_villager_curing}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> SPEEDS_UP_ZOMBIE_VILLAGER_CURING = create(key("speeds_up_zombie_villager_curing"));
+
     /**
      * {@code #minecraft:speleothems}
      *
@@ -1698,6 +1887,27 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> TRIGGERS_AMBIENT_DRIED_GHAST_BLOCK_SOUNDS = create(key("triggers_ambient_dried_ghast_block_sounds"));
 
+    /**
+     * {@code #minecraft:turns_into_dirt_path}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> TURNS_INTO_DIRT_PATH = create(key("turns_into_dirt_path"));
+
+    /**
+     * {@code #minecraft:turns_into_farmland}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> TURNS_INTO_FARMLAND = create(key("turns_into_farmland"));
+
+    /**
+     * {@code #minecraft:uncarvable}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> UNCARVABLE = create(key("uncarvable"));
+
     /**
      * {@code #minecraft:underwater_bonemeals}
      *
@@ -1726,6 +1936,20 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> VIBRATION_RESONATORS = create(key("vibration_resonators"));
 
+    /**
+     * {@code #minecraft:villager_babies_can_jump_on_bed}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> VILLAGER_BABIES_CAN_JUMP_ON_BED = create(key("villager_babies_can_jump_on_bed"));
+
+    /**
+     * {@code #minecraft:villagers_can_sleep_on_bed}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> VILLAGERS_CAN_SLEEP_ON_BED = create(key("villagers_can_sleep_on_bed"));
+
     /**
      * {@code #minecraft:wall_corals}
      *
@@ -1775,6 +1999,13 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> WART_BLOCKS = create(key("wart_blocks"));
 
+    /**
+     * {@code #minecraft:washed_away_by_fluids}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> WASHED_AWAY_BY_FLUIDS = create(key("washed_away_by_fluids"));
+
     /**
      * {@code #minecraft:wither_immune}
      *
@@ -1880,6 +2111,20 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> 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<BlockType> 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<BlockType> WOOL_STAIRS = create(key("wool_stairs"));
+
     private BlockTypeTagKeys() {
     }
 

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

@@ -81,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}
      *
@@ -228,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}
      *

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

@@ -151,6 +151,13 @@ public final class EntityTypeTagKeys {
      */
     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}
      *

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

@@ -25,6 +25,13 @@ import org.jspecify.annotations.NullMarked;
 @NullMarked
 @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}
      *
@@ -32,6 +39,27 @@ public final class FluidTagKeys {
      */
     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}
      *

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

@@ -145,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}
@@ -242,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}
      *
@@ -291,6 +298,20 @@ public final class ItemTypeTagKeys {
      */
     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}
      *
@@ -354,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}
      *
@@ -410,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}
      *
@@ -592,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}
      *
@@ -648,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}
      *
@@ -914,6 +963,13 @@ public final class ItemTypeTagKeys {
      */
     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}
      *
@@ -970,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}
      *
@@ -1068,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}
      *
@@ -1586,6 +1656,20 @@ 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}
      *

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

@@ -25,6 +25,34 @@ import org.jspecify.annotations.NullMarked;
 @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}
      *

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

@@ -25,6 +25,13 @@ import org.jspecify.annotations.NullMarked;
 @NullMarked
 @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}
      *
@@ -67,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}
      *
@@ -75,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}
@@ -110,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}
@@ -131,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}

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

@@ -224,9 +224,11 @@ 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.
@@ -236,12 +238,14 @@ public class MaterialTags {
 
     /**
      * 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(Tag.COAL_ORES, Tag.COPPER_ORES, Tag.IRON_ORES, Tag.GOLD_ORES,
-            Tag.LAPIS_ORES, Tag.REDSTONE_ORES, Tag.DIAMOND_ORES, Tag.EMERALD_ORES)
-        .add(Material.ANCIENT_DEBRIS, Material.NETHER_QUARTZ_ORE).lock();
+        .add(Tag.ORES)
+        .add(Material.ANCIENT_DEBRIS).lock();
 
     /**
      * Covers all piston typed items and blocks including the piston head and moving piston.
@@ -591,7 +595,9 @@ public class MaterialTags {
      */
     @SuppressWarnings("unchecked")
     public static final MaterialSetTag COLORABLE = new MaterialSetTag(keyFor("colorable"))
-        .add(Tag.WOOL, Tag.WOOL_CARPETS, Tag.SHULKER_BOXES, Tag.BEDS, Tag.CONCRETE)
+        .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();
 

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;
     }
@@ -357,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;
     }
 
     /**
@@ -370,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;
     }
 
@@ -419,6 +476,26 @@ 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}, {@link Particle.DustOptions} or {@link Particle.Spell}.

paper-api/src/main/java/io/papermc/paper/block/pot/PotPatternType.java

@@ -0,0 +1,9 @@
+package io.papermc.paper.block.pot;
+
+import org.bukkit.Keyed;
+
+/**
+ * A pot pattern on a decorated pot.
+ */
+public interface PotPatternType extends Keyed {
+}

paper-api/src/main/java/io/papermc/paper/block/pot/PotPatternTypes.java

@@ -0,0 +1,67 @@
+package io.papermc.paper.block.pot;
+
+import io.papermc.paper.registry.RegistryAccess;
+import io.papermc.paper.registry.RegistryKey;
+import net.kyori.adventure.key.Key;
+import net.kyori.adventure.key.KeyPattern;
+
+/**
+ * All pot pattern types.
+ */
+public final class PotPatternTypes {
+
+    // Start generate - PotPatternTypes
+    public static final PotPatternType ANGLER = getType("angler");
+
+    public static final PotPatternType ARCHER = getType("archer");
+
+    public static final PotPatternType ARMS_UP = getType("arms_up");
+
+    public static final PotPatternType BLADE = getType("blade");
+
+    public static final PotPatternType BREWER = getType("brewer");
+
+    public static final PotPatternType BURN = getType("burn");
+
+    public static final PotPatternType DANGER = getType("danger");
+
+    public static final PotPatternType EXPLORER = getType("explorer");
+
+    public static final PotPatternType FLOW = getType("flow");
+
+    public static final PotPatternType FRIEND = getType("friend");
+
+    public static final PotPatternType GUSTER = getType("guster");
+
+    public static final PotPatternType HEART = getType("heart");
+
+    public static final PotPatternType HEARTBREAK = getType("heartbreak");
+
+    public static final PotPatternType HOWL = getType("howl");
+
+    public static final PotPatternType MINER = getType("miner");
+
+    public static final PotPatternType MOURNER = getType("mourner");
+
+    public static final PotPatternType PLENTY = getType("plenty");
+
+    public static final PotPatternType PRIZE = getType("prize");
+
+    public static final PotPatternType SCRAPE = getType("scrape");
+
+    public static final PotPatternType SHEAF = getType("sheaf");
+
+    public static final PotPatternType SHELTER = getType("shelter");
+
+    public static final PotPatternType SKULL = getType("skull");
+
+    public static final PotPatternType SNORT = getType("snort");
+    // End generate - PotPatternTypes
+
+    private static PotPatternType getType(@KeyPattern.Value final String key) {
+        return RegistryAccess.registryAccess().getRegistry(RegistryKey.DECORATED_POT_PATTERN).getOrThrow(Key.key(Key.MINECRAFT_NAMESPACE, key));
+    }
+
+    private PotPatternTypes() {
+    }
+}

paper-api/src/main/java/io/papermc/paper/block/pot/package-info.java

@@ -0,0 +1,7 @@
+/**
+ * Classes relevant to pot blocks.
+ */
+@NullMarked
+package io.papermc.paper.block.pot;
+
+import org.jspecify.annotations.NullMarked;

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

@@ -1,13 +1,16 @@
 package io.papermc.paper.datacomponent;
 
 import io.papermc.paper.annotation.MinecraftVersionDependent;
+import io.papermc.paper.block.pot.PotPatternType;
 import io.papermc.paper.datacomponent.item.AttackRange;
 import io.papermc.paper.datacomponent.item.BannerPatternLayers;
 import io.papermc.paper.datacomponent.item.BlockItemDataProperties;
 import io.papermc.paper.datacomponent.item.BlocksAttacks;
+import io.papermc.paper.datacomponent.item.BrewingFuel;
 import io.papermc.paper.datacomponent.item.BundleContents;
 import io.papermc.paper.datacomponent.item.ChargedProjectiles;
 import io.papermc.paper.datacomponent.item.Consumable;
+import io.papermc.paper.datacomponent.item.CookingFuel;
 import io.papermc.paper.datacomponent.item.CustomModelData;
 import io.papermc.paper.datacomponent.item.DamageResistant;
 import io.papermc.paper.datacomponent.item.DeathProtection;
@@ -27,7 +30,7 @@ import io.papermc.paper.datacomponent.item.KineticWeapon;
 import io.papermc.paper.datacomponent.item.LodestoneTracker;
 import io.papermc.paper.datacomponent.item.MapDecorations;
 import io.papermc.paper.datacomponent.item.MapId;
-import io.papermc.paper.datacomponent.item.MapItemColor;
+import io.papermc.paper.datacomponent.item.MobVisibility;
 import io.papermc.paper.datacomponent.item.OminousBottleAmplifier;
 import io.papermc.paper.datacomponent.item.PiercingWeapon;
 import io.papermc.paper.datacomponent.item.PotDecorations;
@@ -35,6 +38,7 @@ import io.papermc.paper.datacomponent.item.PotionContents;
 import io.papermc.paper.datacomponent.item.Repairable;
 import io.papermc.paper.datacomponent.item.ResolvableProfile;
 import io.papermc.paper.datacomponent.item.SeededContainerLoot;
+import io.papermc.paper.datacomponent.item.SignText;
 import io.papermc.paper.datacomponent.item.SulfurCubeContent;
 import io.papermc.paper.datacomponent.item.SuspiciousStewEffects;
 import io.papermc.paper.datacomponent.item.SwingAnimation;
@@ -43,6 +47,7 @@ import io.papermc.paper.datacomponent.item.TooltipDisplay;
 import io.papermc.paper.datacomponent.item.UseCooldown;
 import io.papermc.paper.datacomponent.item.UseEffects;
 import io.papermc.paper.datacomponent.item.UseRemainder;
+import io.papermc.paper.datacomponent.item.VillagerFood;
 import io.papermc.paper.datacomponent.item.Weapon;
 import io.papermc.paper.datacomponent.item.WritableBookContent;
 import io.papermc.paper.datacomponent.item.WrittenBookContent;
@@ -213,6 +218,7 @@ public final class DataComponentTypes {
      */
     public static final DataComponentType.Valued<Tool> TOOL = valued("tool");
     public static final DataComponentType.Valued<Weapon> WEAPON = valued("weapon");
+    public static final DataComponentType.Valued<AttackRange> ATTACK_RANGE = valued("attack_range");
     public static final DataComponentType.Valued<Enchantable> ENCHANTABLE = valued("enchantable");
     public static final DataComponentType.Valued<Equippable> EQUIPPABLE = valued("equippable");
     public static final DataComponentType.Valued<Repairable> REPAIRABLE = valued("repairable");
@@ -222,8 +228,9 @@ public final class DataComponentTypes {
     public static final DataComponentType.Valued<BlocksAttacks> BLOCKS_ATTACKS = valued("blocks_attacks");
     public static final DataComponentType.Valued<PiercingWeapon> PIERCING_WEAPON = valued("piercing_weapon");
     public static final DataComponentType.Valued<KineticWeapon> KINETIC_WEAPON = valued("kinetic_weapon");
-    public static final DataComponentType.Valued<AttackRange> ATTACK_RANGE = valued("attack_range");
-    public static final DataComponentType.Valued<SwingAnimation> SWING_ANIMATION = valued("swing_animation");
+    public static final DataComponentType.Valued<SwingAnimation> ATTACK_ANIMATION = valued("attack_animation");
+    public static final DataComponentType.Valued<SwingAnimation> INTERACT_ANIMATION = valued("interact_animation");
+    public static final DataComponentType.Valued<VillagerFood> VILLAGER_FOOD = valued("villager_food");
     /**
      * Stores list of enchantments and their levels for an Enchanted Book.
      * Unlike {@link #ENCHANTMENTS}, the effects provided by enchantments
@@ -243,10 +250,6 @@ public final class DataComponentTypes {
      * Represents a color applied to a dyeable item.
      */
     public static final DataComponentType.Valued<DyedItemColor> DYED_COLOR = valued("dyed_color");
-    /**
-     * Represents the tint of the decorations on the {@link org.bukkit.inventory.ItemType#FILLED_MAP} item.
-     */
-    public static final DataComponentType.Valued<MapItemColor> MAP_COLOR = valued("map_color");
     /**
      * References the shared map state holding map contents and markers for a {@link org.bukkit.inventory.ItemType#FILLED_MAP}.
      */
@@ -299,7 +302,6 @@ public final class DataComponentTypes {
      * Holds the instrument type used by a Goat Horn.
      */
     public static final DataComponentType.Valued<MusicInstrument> INSTRUMENT = valued("instrument");
-    // this is a either holder, but due to legacy item loading
     public static final DataComponentType.Valued<TrimMaterial> PROVIDES_TRIM_MATERIAL = valued("provides_trim_material");
     /**
      * Controls the amplifier amount for an Ominous Bottle's Bad Omen effect.
@@ -366,6 +368,7 @@ public final class DataComponentTypes {
      */
     public static final DataComponentType.Valued<SeededContainerLoot> CONTAINER_LOOT = valued("container_loot");
     public static final DataComponentType.Valued<Key> BREAK_SOUND = valued("break_sound");
+    public static final DataComponentType.Valued<MobVisibility> MOB_VISIBILITY = valued("mob_visibility");
     public static final DataComponentType.Valued<Villager.Type> VILLAGER_VARIANT = valued("villager/variant");
     public static final DataComponentType.Valued<Wolf.Variant> WOLF_VARIANT = valued("wolf/variant");
     public static final DataComponentType.Valued<Wolf.SoundVariant> WOLF_SOUND_VARIANT = valued("wolf/sound_variant");
@@ -395,6 +398,19 @@ public final class DataComponentTypes {
     public static final DataComponentType.Valued<DyeColor> CAT_COLLAR = valued("cat/collar");
     public static final DataComponentType.Valued<DyeColor> SHEEP_COLOR = valued("sheep/color");
     public static final DataComponentType.Valued<DyeColor> SHULKER_COLOR = valued("shulker/color");
+    public static final DataComponentType.Valued<PotPatternType> PROVIDES_POTTERY_PATTERN = valued("provides_pottery_pattern");
+    public static final DataComponentType.Valued<SignText> SIGN_TEXT_FRONT = valued("sign_text_front");
+    public static final DataComponentType.Valued<SignText> SIGN_TEXT_BACK = valued("sign_text_back");
+    public static final DataComponentType.NonValued WAXED = unvalued("waxed");
+    public static final DataComponentType.Valued<DyeColor> CUSHION_COLOR = valued("cushion/color");
+    /**
+     * Describes an item that can be used as fuel for a furnace, smoker or blast furnace.
+     */
+    public static final DataComponentType.Valued<CookingFuel> COOKING_FUEL = valued("cooking_fuel");
+    /**
+     * Describes an item that can be used as fuel for a brewing stand.
+     */
+    public static final DataComponentType.Valued<BrewingFuel> BREWING_FUEL = valued("brewing_fuel");
 
     private static DataComponentType.NonValued unvalued(@KeyPattern.Value final String key) {
         final DataComponentType dataComponentType = Registry.DATA_COMPONENT_TYPE.getOrThrow(Key.key(Key.MINECRAFT_NAMESPACE, key));

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

@@ -4,9 +4,7 @@ import io.papermc.paper.datacomponent.DataComponentBuilder;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Range;
-import org.jspecify.annotations.NullMarked;
 
-@NullMarked
 @ApiStatus.NonExtendable
 public interface AttackRange {
 

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

@@ -6,13 +6,11 @@ import org.bukkit.block.banner.Pattern;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Unmodifiable;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Holds the layers of patterns on a banner.
  * @see io.papermc.paper.datacomponent.DataComponentTypes#BANNER_PATTERNS
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface BannerPatternLayers {
 

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

@@ -5,13 +5,11 @@ import org.bukkit.block.BlockType;
 import org.bukkit.block.data.BlockData;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Holds the {@link BlockData} properties of a block item.
  * @see io.papermc.paper.datacomponent.DataComponentTypes#BLOCK_DATA
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface BlockItemDataProperties {
 

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

@@ -10,7 +10,6 @@ import org.bukkit.damage.DamageType;
 import org.checkerframework.checker.index.qual.NonNegative;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 /**
@@ -18,7 +17,6 @@ import org.jspecify.annotations.Nullable;
  *
  * @see io.papermc.paper.datacomponent.DataComponentTypes#BLOCKS_ATTACKS
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface BlocksAttacks {
 

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

@@ -0,0 +1,56 @@
+package io.papermc.paper.datacomponent.item;
+
+import io.papermc.paper.datacomponent.DataComponentBuilder;
+import io.papermc.paper.loot.number.ResolvableFloat;
+import io.papermc.paper.loot.number.ResolvableInt;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Contract;
+
+/**
+ * Describes an item that can be used as fuel for a brewing stand.
+ *
+ * @see io.papermc.paper.datacomponent.DataComponentTypes#BREWING_FUEL
+ */
+@ApiStatus.NonExtendable
+public interface BrewingFuel {
+
+    @Contract(value = "-> new", pure = true)
+    static BrewingFuel.Builder brewingFuel() {
+        return ItemComponentTypesBridge.bridge().brewingFuel();
+    }
+
+    /**
+     * @return the number of times this fuel will brew before being consumed
+     */
+    @Contract(pure = true)
+    ResolvableInt uses();
+
+    /**
+     * @return the speed of the brewing
+     */
+    @Contract(pure = true)
+    ResolvableFloat speedMultiplier();
+
+    /**
+     * Builder for {@link BrewingFuel}.
+     */
+    @ApiStatus.NonExtendable
+    interface Builder extends DataComponentBuilder<BrewingFuel> {
+
+        /**
+         * @param uses the number of times this fuel will brew before being consumed
+         * @return the builder for chaining
+         * @see #uses()
+         */
+        @Contract(value = "_ -> this", mutates = "this")
+        Builder uses(int uses);
+
+        /**
+         * @param speedMultiplier the speed of the brewing
+         * @return the builder for chaining
+         * @see #speedMultiplier()
+         */
+        @Contract(value = "_ -> this", mutates = "this")
+        Builder speedMultiplier(float speedMultiplier);
+    }
+}

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

@@ -6,13 +6,11 @@ import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Unmodifiable;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Holds all items stored inside of a Bundle.
  * @see io.papermc.paper.datacomponent.DataComponentTypes#BUNDLE_CONTENTS
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface BundleContents {
 

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

@@ -6,13 +6,11 @@ import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Unmodifiable;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Holds all projectiles that have been loaded into a Crossbow.
  * @see io.papermc.paper.datacomponent.DataComponentTypes#CHARGED_PROJECTILES
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface ChargedProjectiles {
 

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

@@ -10,13 +10,11 @@ import org.checkerframework.checker.index.qual.NonNegative;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Unmodifiable;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Holds the properties for this item for when it is consumed.
  * @see io.papermc.paper.datacomponent.DataComponentTypes#CONSUMABLE
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface Consumable extends BuildableDataComponent<Consumable, Consumable.Builder> {
 

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

@@ -0,0 +1,56 @@
+package io.papermc.paper.datacomponent.item;
+
+import io.papermc.paper.datacomponent.DataComponentBuilder;
+import io.papermc.paper.loot.number.ResolvableFloat;
+import io.papermc.paper.loot.number.ResolvableInt;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Contract;
+
+/**
+ * Describes an item that can be used as fuel for a furnace, smoker or blast furnace.
+ *
+ * @see io.papermc.paper.datacomponent.DataComponentTypes#COOKING_FUEL
+ */
+@ApiStatus.NonExtendable
+public interface CookingFuel {
+
+    @Contract(value = "-> new", pure = true)
+    static CookingFuel.Builder cookingFuel() {
+        return ItemComponentTypesBridge.bridge().cookingFuel();
+    }
+
+    /**
+     * @return the time, in ticks, for which this fuel will burn
+     */
+    @Contract(pure = true)
+    ResolvableInt burnTime();
+
+    /**
+     * @return the speed of the cooking/smelting
+     */
+    @Contract(pure = true)
+    ResolvableFloat speedMultiplier();
+
+    /**
+     * Builder for {@link CookingFuel}.
+     */
+    @ApiStatus.NonExtendable
+    interface Builder extends DataComponentBuilder<CookingFuel> {
+
+        /**
+         * @param speedMultiplier the speed of the cooking/smelting
+         * @return the builder for chaining
+         * @see #speedMultiplier()
+         */
+        @Contract(value = "_ -> this", mutates = "this")
+        Builder speedMultiplier(float speedMultiplier);
+
+        /**
+         * @param burnTime the time, in ticks, for which this fuel will burn
+         * @return the builder for chaining
+         * @see #speedMultiplier()
+         */
+        @Contract(value = "_ -> this", mutates = "this")
+        Builder burnTime(int burnTime);
+    }
+}

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

@@ -6,14 +6,12 @@ import org.bukkit.Color;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Unmodifiable;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Holds the custom model data.
  *
  * @see io.papermc.paper.datacomponent.DataComponentTypes#CUSTOM_MODEL_DATA
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface CustomModelData {
 

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

@@ -4,13 +4,11 @@ import io.papermc.paper.registry.set.RegistryKeySet;
 import org.bukkit.damage.DamageType;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Holds the contents of damage types that the item entity containing this item is invincible to.
  * @see io.papermc.paper.datacomponent.DataComponentTypes#DAMAGE_RESISTANT
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface DamageResistant {
 

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

@@ -6,13 +6,11 @@ import java.util.List;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Unmodifiable;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Sets whether this item should protect the entity upon death, and what effects should be played.
  * @see io.papermc.paper.datacomponent.DataComponentTypes#DEATH_PROTECTION
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface DeathProtection {
 

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

@@ -4,13 +4,11 @@ import io.papermc.paper.datacomponent.DataComponentBuilder;
 import org.bukkit.Color;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Represents a color applied to a dyeable item.
  * @see io.papermc.paper.datacomponent.DataComponentTypes#DYED_COLOR
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface DyedItemColor {
 

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

@@ -3,13 +3,11 @@ package io.papermc.paper.datacomponent.item;
 import org.checkerframework.checker.index.qual.Positive;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Holds if an item is enchantable, allowing for enchantments of the type to be seen in an enchanting table.
  * @see io.papermc.paper.datacomponent.DataComponentTypes#ENCHANTABLE
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface Enchantable {
 

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

@@ -8,14 +8,12 @@ import org.bukkit.entity.EntityType;
 import org.bukkit.inventory.EquipmentSlot;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 /**
  * Holds the equippable properties of an item.
  * @see io.papermc.paper.datacomponent.DataComponentTypes#EQUIPPABLE
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface Equippable extends BuildableDataComponent<Equippable, Equippable.Builder> {
 

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

@@ -7,13 +7,11 @@ import org.checkerframework.common.value.qual.IntRange;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Unmodifiable;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Stores all explosions crafted into a Firework Rocket, as well as flight duration.
  * @see io.papermc.paper.datacomponent.DataComponentTypes#FIREWORKS
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface Fireworks {
 

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

@@ -5,13 +5,11 @@ import io.papermc.paper.datacomponent.DataComponentBuilder;
 import org.checkerframework.checker.index.qual.NonNegative;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Holds the food properties of an item.
  * @see io.papermc.paper.datacomponent.DataComponentTypes#FOOD
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface FoodProperties extends BuildableDataComponent<FoodProperties, FoodProperties.Builder> {
 

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

@@ -6,14 +6,12 @@ import java.util.List;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Unmodifiable;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Controls which blocks a player in Adventure mode can do a certain action with this item.
  * @see io.papermc.paper.datacomponent.DataComponentTypes#CAN_BREAK
  * @see io.papermc.paper.datacomponent.DataComponentTypes#CAN_PLACE_ON
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface ItemAdventurePredicate {
 

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

@@ -4,13 +4,11 @@ import io.papermc.paper.datacomponent.DataComponentBuilder;
 import org.bukkit.inventory.meta.trim.ArmorTrim;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Holds the trims applied to an item.
  * @see io.papermc.paper.datacomponent.DataComponentTypes#TRIM
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface ItemArmorTrim  {
 

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

@@ -9,13 +9,11 @@ import org.bukkit.inventory.EquipmentSlotGroup;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Unmodifiable;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Holds attribute modifiers applied to any item.
  * @see io.papermc.paper.datacomponent.DataComponentTypes#ATTRIBUTE_MODIFIERS
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface ItemAttributeModifiers {
 

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

@@ -2,7 +2,6 @@ package io.papermc.paper.datacomponent.item;
 
 import com.destroystokyo.paper.profile.PlayerProfile;
 import io.papermc.paper.registry.set.RegistryKeySet;
-import io.papermc.paper.registry.tag.TagKey;
 import io.papermc.paper.text.Filtered;
 import java.util.Optional;
 import java.util.ServiceLoader;
@@ -11,17 +10,14 @@ import net.kyori.adventure.util.TriState;
 import org.bukkit.JukeboxSong;
 import org.bukkit.block.BlockType;
 import org.bukkit.damage.DamageType;
+import org.bukkit.entity.EntityType;
 import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.ItemType;
 import org.bukkit.inventory.meta.trim.ArmorTrim;
 import org.bukkit.map.MapCursor;
-import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
-@NullMarked
-@ApiStatus.Internal
 interface ItemComponentTypesBridge {
 
     Optional<ItemComponentTypesBridge> BRIDGE = ServiceLoader.load(ItemComponentTypesBridge.class, ItemComponentTypesBridge.class.getClassLoader()).findFirst();
@@ -50,11 +46,9 @@ interface ItemComponentTypesBridge {
 
     SuspiciousStewEffects.Builder suspiciousStewEffects();
 
-    MapItemColor.Builder mapItemColor();
-
     MapDecorations.Builder mapDecorations();
 
-    MapDecorations.DecorationEntry decorationEntry(MapCursor.Type type, double x, double z, float rotation);
+    MapDecorations.DecorationEntry mapDecorationEntry(MapCursor.Type type, double x, double z, float rotation);
 
     SeededContainerLoot.Builder seededContainerLoot(Key lootTableKey);
 
@@ -68,14 +62,14 @@ interface ItemComponentTypesBridge {
 
     Fireworks.Builder fireworks();
 
+    ResolvableProfile resolvableProfile(PlayerProfile profile);
+
     ResolvableProfile.Builder resolvableProfile();
 
     ResolvableProfile.SkinPatchBuilder skinPatch();
 
     ResolvableProfile.SkinPatch emptySkinPatch();
 
-    ResolvableProfile resolvableProfile(PlayerProfile profile);
-
     BannerPatternLayers.Builder bannerPatternLayers();
 
     BlockItemDataProperties.Builder blockItemStateProperties();
@@ -86,7 +80,7 @@ interface ItemComponentTypesBridge {
 
     Tool.Builder tool();
 
-    Tool.Rule rule(RegistryKeySet<BlockType> blocks, @Nullable Float speed, TriState correctForDrops);
+    Tool.Rule toolRule(RegistryKeySet<BlockType> blocks, @Nullable Float speed, TriState correctForDrops);
 
     ItemAdventurePredicate.Builder itemAdventurePredicate();
 
@@ -120,6 +114,8 @@ interface ItemComponentTypesBridge {
 
     KineticWeapon.Builder kineticWeapon();
 
+    KineticWeapon.Condition kineticWeaponCondition(int maxDurationTicks, float minSpeed, float minRelativeSpeed);
+
     UseEffects.Builder useEffects();
 
     PiercingWeapon.Builder piercingWeapon();
@@ -128,7 +124,15 @@ interface ItemComponentTypesBridge {
 
     SwingAnimation.Builder swingAnimation();
 
-    KineticWeapon.Condition kineticWeaponCondition(int maxDurationTicks, float minSpeed, float minRelativeSpeed);
-
     SulfurCubeContent sulfurCubeContent(ItemStack absorbedItem);
+
+    MobVisibility mobVisibility(RegistryKeySet<EntityType> targetingEntityTypes, float visibility);
+
+    VillagerFood villagerFood(int nutrition);
+
+    SignText.Builder signText();
+
+    BrewingFuel.Builder brewingFuel();
+
+    CookingFuel.Builder cookingFuel();
 }

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

@@ -6,13 +6,11 @@ import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Unmodifiable;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Holds the contents of an item container.
  * @see io.papermc.paper.datacomponent.DataComponentTypes#CONTAINER
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface ItemContainerContents {
 

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

@@ -7,14 +7,12 @@ import org.checkerframework.common.value.qual.IntRange;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Unmodifiable;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Stores a list of enchantments and their levels on an item.
  * @see io.papermc.paper.datacomponent.DataComponentTypes#ENCHANTMENTS
  * @see io.papermc.paper.datacomponent.DataComponentTypes#STORED_ENCHANTMENTS
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface ItemEnchantments {
 

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

@@ -7,13 +7,11 @@ import net.kyori.adventure.text.ComponentLike;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Unmodifiable;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Additional lines to include in an item's tooltip.
  * @see io.papermc.paper.datacomponent.DataComponentTypes#LORE
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface ItemLore {
 

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

@@ -4,13 +4,11 @@ import io.papermc.paper.datacomponent.DataComponentBuilder;
 import org.bukkit.JukeboxSong;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Holds the jukebox song for an item.
  * @see io.papermc.paper.datacomponent.DataComponentTypes#JUKEBOX_PLAYABLE
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface JukeboxPlayable  {
 

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

@@ -5,11 +5,8 @@ import net.kyori.adventure.key.Key;
 import org.checkerframework.checker.index.qual.NonNegative;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.Range;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
-@NullMarked
 @ApiStatus.NonExtendable
 public interface KineticWeapon {
 

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

@@ -4,14 +4,12 @@ import io.papermc.paper.datacomponent.DataComponentBuilder;
 import org.bukkit.Location;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 /**
  * If present, specifies the target Lodestone that a Compass should point towards.
  * @see io.papermc.paper.datacomponent.DataComponentTypes#LODESTONE_TRACKER
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface LodestoneTracker {
 

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

@@ -6,14 +6,12 @@ import org.bukkit.map.MapCursor;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Unmodifiable;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 /**
  * Holds a list of markers to be placed on a Filled Map (used for Explorer Maps).
  * @see io.papermc.paper.datacomponent.DataComponentTypes#MAP_DECORATIONS
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface MapDecorations {
 
@@ -29,7 +27,7 @@ public interface MapDecorations {
 
     @Contract(value = "_, _, _, _ -> new", pure = true)
     static DecorationEntry decorationEntry(final MapCursor.Type type, final double x, final double z, final float rotation) {
-        return ItemComponentTypesBridge.bridge().decorationEntry(type, x, z, rotation);
+        return ItemComponentTypesBridge.bridge().mapDecorationEntry(type, x, z, rotation);
     }
 
     /**

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

@@ -2,13 +2,11 @@ package io.papermc.paper.datacomponent.item;
 
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * References the shared map state holding map contents and markers for a Filled Map.
  * @see io.papermc.paper.datacomponent.DataComponentTypes#MAP_ID
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface MapId {
 

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

@@ -1,42 +0,0 @@
-package io.papermc.paper.datacomponent.item;
-
-import io.papermc.paper.datacomponent.DataComponentBuilder;
-import org.bukkit.Color;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;
-
-/**
- * Represents the tint of the decorations on the Filled Map item.
- * @see io.papermc.paper.datacomponent.DataComponentTypes#MAP_COLOR
- */
-@NullMarked
-@ApiStatus.NonExtendable
-public interface MapItemColor {
-
-    @Contract(value = "-> new", pure = true)
-    static MapItemColor.Builder mapItemColor() {
-        return ItemComponentTypesBridge.bridge().mapItemColor();
-    }
-
-    /**
-     * The tint to apply.
-     *
-     * @return color
-     */
-    Color color();
-
-    @ApiStatus.NonExtendable
-    interface Builder extends DataComponentBuilder<MapItemColor> {
-
-        /**
-         * Sets the tint color of this map.
-         *
-         * @param color tint color
-         * @return the builder for chaining
-         * @see #color()
-         */
-        @Contract(value = "_ -> this", mutates = "this")
-        Builder color(Color color);
-    }
-}

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

@@ -0,0 +1,39 @@
+package io.papermc.paper.datacomponent.item;
+
+import io.papermc.paper.datacomponent.DataComponentTypes;
+import io.papermc.paper.registry.set.RegistryKeySet;
+import org.bukkit.entity.EntityType;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.Range;
+
+/**
+ * Represents the visibility provided by an item with the appropriate {@link DataComponentTypes#EQUIPPABLE} component,
+ * modifying the range at which mobs are able to detect an entity.
+ *
+ * @see io.papermc.paper.datacomponent.DataComponentTypes#MOB_VISIBILITY
+ */
+@ApiStatus.NonExtendable
+public interface MobVisibility {
+
+    @Contract(value = "_, _ -> new", pure = true)
+    static MobVisibility mobVisibility(final RegistryKeySet<EntityType> targetingEntityTypes, final @Range(from = 0, to = 10) float visibility) {
+        return ItemComponentTypesBridge.bridge().mobVisibility(targetingEntityTypes, visibility);
+    }
+
+    /**
+     * Gets the set of entity types that this item modifies the visibility for.
+     *
+     * @return the set of entity types
+     */
+    @Contract(pure = true)
+    RegistryKeySet<EntityType> targetingEntityTypes();
+
+    /**
+     * Gets the visibility provided by this item, modifying the range at which mobs are able to detect an entity.
+     *
+     * @return the visibility
+     */
+    @Contract(pure = true)
+    @Range(from = 0, to = 10) float visibility();
+}

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

@@ -3,13 +3,11 @@ package io.papermc.paper.datacomponent.item;
 import org.checkerframework.common.value.qual.IntRange;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Holds the ominous bottle amplifier.
  * @see io.papermc.paper.datacomponent.DataComponentTypes#OMINOUS_BOTTLE_AMPLIFIER
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface OminousBottleAmplifier {
 

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

@@ -4,11 +4,8 @@ import io.papermc.paper.datacomponent.DataComponentBuilder;
 import net.kyori.adventure.key.Key;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.Range;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
-@NullMarked
 @ApiStatus.NonExtendable
 public interface PiercingWeapon {
 

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

@@ -4,14 +4,12 @@ import io.papermc.paper.datacomponent.DataComponentBuilder;
 import org.bukkit.inventory.ItemType;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 /**
  * Holds the item types for the decorations on a flower pot.
  * @see io.papermc.paper.datacomponent.DataComponentTypes#POT_DECORATIONS
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface PotDecorations {
 

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

@@ -8,14 +8,12 @@ import org.bukkit.potion.PotionType;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Unmodifiable;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 /**
  * Holds the contents of a potion (Potion, Splash Potion, Lingering Potion), or potion applied to a Tipped Arrow.
  * @see io.papermc.paper.datacomponent.DataComponentTypes#POTION_CONTENTS
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface PotionContents {
 

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

@@ -4,13 +4,11 @@ import io.papermc.paper.registry.set.RegistryKeySet;
 import org.bukkit.inventory.ItemType;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Holds if this item is repairable, and what item types it can be repaired with.
  * @see io.papermc.paper.datacomponent.DataComponentTypes#REPAIRABLE
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface Repairable {
 

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

@@ -14,7 +14,6 @@ import org.intellij.lang.annotations.Pattern;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Unmodifiable;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 /**
@@ -22,7 +21,6 @@ import org.jspecify.annotations.Nullable;
  *
  * @see io.papermc.paper.datacomponent.DataComponentTypes#PROFILE
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface ResolvableProfile extends PlayerHeadObjectContents.SkinSource {
 

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

@@ -4,13 +4,11 @@ import io.papermc.paper.datacomponent.DataComponentBuilder;
 import net.kyori.adventure.key.Key;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Holds the loot table and seed for a container.
  * @see io.papermc.paper.datacomponent.DataComponentTypes#CONTAINER_LOOT
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface SeededContainerLoot {
 

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

@@ -0,0 +1,99 @@
+package io.papermc.paper.datacomponent.item;
+
+import io.papermc.paper.datacomponent.BuildableDataComponent;
+import io.papermc.paper.datacomponent.DataComponentBuilder;
+import java.util.List;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.ComponentLike;
+import org.bukkit.DyeColor;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Contract;
+
+/**
+ * Represents the lines of text on a sign side.
+ *
+ * @see io.papermc.paper.datacomponent.DataComponentTypes#SIGN_TEXT_FRONT
+ * @see io.papermc.paper.datacomponent.DataComponentTypes#SIGN_TEXT_BACK
+ */
+@ApiStatus.NonExtendable
+public interface SignText extends BuildableDataComponent<SignText, SignText.Builder> {
+
+    @Contract(value = "_ -> new", pure = true)
+    static SignText signText(final List<? extends ComponentLike> lines) {
+        return signText().lines(lines).build();
+    }
+
+    @Contract(value = "-> new", pure = true)
+    static SignText.Builder signText() {
+        return ItemComponentTypesBridge.bridge().signText();
+    }
+
+    /**
+     * Gets the lines on this sign side.
+     *
+     * @return the list of messages
+     */
+    @Contract(pure = true)
+    List<Component> lines();
+
+    /**
+     * Gets the color of the text on this sign side.
+     *
+     * @return the color of the text
+     */
+    @Contract(pure = true)
+    DyeColor color();
+
+    /**
+     * Checks if the text on this sign side has a glowing effect.
+     *
+     * @return true if the text has a glowing effect, false otherwise
+     */
+    @Contract(pure = true)
+    boolean hasGlowingText();
+
+    /**
+     * Builder for {@link SignText}.
+     */
+    @ApiStatus.NonExtendable
+    interface Builder extends DataComponentBuilder<SignText> {
+
+        /**
+         * Sets the lines on this sign side.
+         *
+         * @param lines the list of messages
+         * @return the builder for chaining
+         */
+        @Contract(value = "_ -> this", mutates = "this")
+        Builder lines(List<? extends ComponentLike> lines);
+
+        /**
+         * Sets a line at the specified index on this sign side.
+         *
+         * @param index the line index
+         * @param line the message
+         * @return the builder for chaining
+         * @throws IndexOutOfBoundsException when the line does not exist
+         */
+        @Contract(value = "_, _ -> this", mutates = "this")
+        Builder line(int index, ComponentLike line);
+
+        /**
+         * Sets the color of the text on this sign side.
+         *
+         * @param color the color of the text
+         * @return the builder for chaining
+         */
+        @Contract(value = "_ -> this", mutates = "this")
+        Builder color(DyeColor color);
+
+        /**
+         * Sets whether the text on this sign side has a glowing effect.
+         *
+         * @param hasGlowingText {@code true} if the text has a glowing effect
+         * @return the builder for chaining
+         */
+        @Contract(value = "_ -> this", mutates = "this")
+        Builder hasGlowingText(boolean hasGlowingText);
+    }
+}

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

@@ -3,13 +3,11 @@ package io.papermc.paper.datacomponent.item;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Holds the item absorbed by a sulfur cube.
  * @see io.papermc.paper.datacomponent.DataComponentTypes#SULFUR_CUBE_CONTENT
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface SulfurCubeContent {
 

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

@@ -7,13 +7,11 @@ import java.util.List;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Unmodifiable;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Holds the effects that will be applied when consuming Suspicious Stew.
  * @see io.papermc.paper.datacomponent.DataComponentTypes#SUSPICIOUS_STEW_EFFECTS
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface SuspiciousStewEffects {
 

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

@@ -1,12 +1,10 @@
 package io.papermc.paper.datacomponent.item;
 
 import io.papermc.paper.datacomponent.DataComponentBuilder;
-import org.checkerframework.checker.index.qual.Positive;
+import org.checkerframework.checker.index.qual.NonNegative;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;
 
-@NullMarked
 @ApiStatus.NonExtendable
 public interface SwingAnimation {
 
@@ -19,7 +17,7 @@ public interface SwingAnimation {
     Animation type();
 
     @Contract(pure = true)
-    @Positive int duration();
+    @NonNegative int duration();
 
     enum Animation {
         // Start generate - SwingAnimationType
@@ -53,6 +51,6 @@ public interface SwingAnimation {
          * @see #duration()
          */
         @Contract(value = "_ -> this", mutates = "this")
-        Builder duration(@Positive int duration);
+        Builder duration(@NonNegative int duration);
     }
 }

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

@@ -11,14 +11,12 @@ import org.checkerframework.checker.index.qual.NonNegative;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Unmodifiable;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 /**
  * Controls the behavior of the item as a tool.
  * @see DataComponentTypes#TOOL
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface Tool {
 
@@ -44,7 +42,7 @@ public interface Tool {
      * @return A new {@link Rule} instance representing the mining rule.
      */
     static Rule rule(final RegistryKeySet<BlockType> blocks, final @Nullable Float speed, final TriState correctForDrops) {
-        return ItemComponentTypesBridge.bridge().rule(blocks, speed, correctForDrops);
+        return ItemComponentTypesBridge.bridge().toolRule(blocks, speed, correctForDrops);
     }
 
     /**

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

@@ -5,9 +5,7 @@ import io.papermc.paper.datacomponent.DataComponentType;
 import java.util.Set;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;
 
-@NullMarked
 @ApiStatus.NonExtendable
 public interface TooltipDisplay {
 

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

@@ -5,14 +5,12 @@ import net.kyori.adventure.key.Key;
 import org.checkerframework.checker.index.qual.Positive;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 /**
  * Holds the contents of cooldown information when an item is used.
  * @see io.papermc.paper.datacomponent.DataComponentTypes#USE_COOLDOWN
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface UseCooldown {
 

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

@@ -3,9 +3,7 @@ package io.papermc.paper.datacomponent.item;
 import io.papermc.paper.datacomponent.DataComponentBuilder;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;
 
-@NullMarked
 @ApiStatus.NonExtendable
 public interface UseEffects {
 

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

@@ -3,13 +3,11 @@ package io.papermc.paper.datacomponent.item;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Holds the contents of item transformation information when an item is used.
  * @see io.papermc.paper.datacomponent.DataComponentTypes#USE_REMAINDER
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface UseRemainder {
 

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

@@ -0,0 +1,29 @@
+package io.papermc.paper.datacomponent.item;
+
+import org.bukkit.Tag;
+import org.checkerframework.checker.index.qual.Positive;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Contract;
+
+/**
+ * Represents items that villagers can eat.
+ * Villagers will pick up items with this component in addition to items in the {@link Tag#ITEMS_VILLAGER_PICKS_UP} tag.
+ *
+ * @see io.papermc.paper.datacomponent.DataComponentTypes#VILLAGER_FOOD
+ */
+@ApiStatus.NonExtendable
+public interface VillagerFood {
+
+    @Contract(value = "_ -> new", pure = true)
+    static VillagerFood villagerFood(final @Positive int nutrition) {
+        return ItemComponentTypesBridge.bridge().villagerFood(nutrition);
+    }
+
+    /**
+     * Gets the nutrition value of this item.
+     *
+     * @return the nutrition value
+     */
+    @Contract(pure = true)
+    @Positive int nutrition();
+}

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

@@ -3,9 +3,7 @@ package io.papermc.paper.datacomponent.item;
 import io.papermc.paper.datacomponent.DataComponentBuilder;
 import org.checkerframework.checker.index.qual.NonNegative;
 import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;
 
-@NullMarked
 @ApiStatus.NonExtendable
 public interface Weapon {
 

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

@@ -7,13 +7,11 @@ import net.kyori.adventure.inventory.BookLike;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Unmodifiable;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Holds the pages for a writable book.
  * @see io.papermc.paper.datacomponent.DataComponentTypes#WRITABLE_BOOK_CONTENT
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface WritableBookContent extends BookLike {
 

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

@@ -10,13 +10,11 @@ import org.checkerframework.common.value.qual.IntRange;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Unmodifiable;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Holds the contents and metadata of a Written Book.
  * @see io.papermc.paper.datacomponent.DataComponentTypes#WRITTEN_BOOK_CONTENT
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface WrittenBookContent extends BookLike {
 

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

@@ -4,7 +4,6 @@ import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.ComponentLike;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * The display behavior for a dedicated attribute entry.
@@ -12,7 +11,6 @@ import org.jspecify.annotations.NullMarked;
  * @see io.papermc.paper.datacomponent.DataComponentTypes#ATTRIBUTE_MODIFIERS
  * @see io.papermc.paper.datacomponent.item.ItemAttributeModifiers#itemAttributes()
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface AttributeModifierDisplay {
 

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

@@ -3,11 +3,7 @@ package io.papermc.paper.datacomponent.item.attribute;
 import java.util.Optional;
 import java.util.ServiceLoader;
 import net.kyori.adventure.text.ComponentLike;
-import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;
 
-@NullMarked
-@ApiStatus.Internal
 interface AttributeModifierDisplayBridge {
 
     Optional<AttributeModifierDisplayBridge> BRIDGE = ServiceLoader.load(AttributeModifierDisplayBridge.class, AttributeModifierDisplayBridge.class.getClassLoader()).findFirst();

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

@@ -2,11 +2,7 @@ package io.papermc.paper.datacomponent.item.blocksattacks;
 
 import java.util.Optional;
 import java.util.ServiceLoader;
-import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;
 
-@NullMarked
-@ApiStatus.Internal
 interface BlocksAttacksBridge {
 
     Optional<BlocksAttacksBridge> BRIDGE = ServiceLoader.load(BlocksAttacksBridge.class, BlocksAttacksBridge.class.getClassLoader()).findFirst();

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

@@ -6,7 +6,6 @@ import org.bukkit.damage.DamageType;
 import org.checkerframework.checker.index.qual.Positive;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 /**
@@ -15,7 +14,6 @@ import org.jspecify.annotations.Nullable;
  * @see io.papermc.paper.datacomponent.DataComponentTypes#BLOCKS_ATTACKS
  * @see io.papermc.paper.datacomponent.item.BlocksAttacks#damageReductions()
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface DamageReduction {
 

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

@@ -4,7 +4,6 @@ import io.papermc.paper.datacomponent.DataComponentBuilder;
 import org.checkerframework.checker.index.qual.NonNegative;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Hold how much damage should be applied to the item from a given attack.
@@ -12,7 +11,6 @@ import org.jspecify.annotations.NullMarked;
  * @see io.papermc.paper.datacomponent.DataComponentTypes#BLOCKS_ATTACKS
  * @see io.papermc.paper.datacomponent.item.BlocksAttacks#itemDamage()
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface ItemDamageFunction {
 

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

@@ -7,11 +7,7 @@ import java.util.ServiceLoader;
 import net.kyori.adventure.key.Key;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
-import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;
 
-@NullMarked
-@ApiStatus.Internal
 interface ConsumableTypesBridge {
 
     Optional<ConsumableTypesBridge> BRIDGE = ServiceLoader.load(ConsumableTypesBridge.class, ConsumableTypesBridge.class.getClassLoader()).findFirst();
@@ -28,5 +24,5 @@ interface ConsumableTypesBridge {
 
     ConsumeEffect.PlaySound playSoundEffect(Key sound);
 
-    ConsumeEffect.TeleportRandomly teleportRandomlyEffect(float diameter);
+    ConsumeEffect.TeleportRandomly teleportRandomlyEffect(float diameter, boolean directionalParticles);
 }

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

@@ -7,12 +7,10 @@ import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Effect that occurs when consuming an item.
  */
-@NullMarked
 @ApiStatus.NonExtendable
 public interface ConsumeEffect {
 
@@ -21,10 +19,23 @@ public interface ConsumeEffect {
      *
      * @param diameter diameter of random teleportation
      * @return the effect instance
+     * @see #teleportRandomlyEffect(float, boolean)
      */
     @Contract(value = "_ -> new", pure = true)
     static TeleportRandomly teleportRandomlyEffect(final float diameter) {
-        return ConsumableTypesBridge.bridge().teleportRandomlyEffect(diameter);
+        return teleportRandomlyEffect(diameter, true);
+    }
+
+    /**
+     * Creates a consume effect that randomly teleports the entity on consumption.
+     *
+     * @param diameter diameter of random teleportation
+     * @param directionalParticles show a particle trail in the direction of the teleportation
+     * @return the effect instance
+     */
+    @Contract(value = "_, _ -> new", pure = true)
+    static TeleportRandomly teleportRandomlyEffect(final float diameter, final boolean directionalParticles) {
+        return ConsumableTypesBridge.bridge().teleportRandomlyEffect(diameter, directionalParticles);
     }
 
     /**
@@ -83,6 +94,13 @@ public interface ConsumeEffect {
          * @return teleportation diameter
          */
         float diameter();
+
+        /**
+         * Checks whether to show a particle trail in the direction of the teleportation.
+         *
+         * @return {@code true} if the particle trail should be shown
+         */
+        boolean directionalParticles();
     }
 
     /**

paper-api/src/main/java/io/papermc/paper/event/block/CompostItemEvent.java

@@ -18,13 +18,13 @@ public class CompostItemEvent extends BlockEvent {
     private static final HandlerList HANDLER_LIST = new HandlerList();
 
     private final ItemStack item;
-    private boolean willRaiseLevel;
+    private int raisedLevels;
 
     @ApiStatus.Internal
-    public CompostItemEvent(final Block composter, final ItemStack item, final boolean willRaiseLevel) {
+    public CompostItemEvent(final Block composter, final ItemStack item, final int raisedLevels) {
         super(composter);
         this.item = item;
-        this.willRaiseLevel = willRaiseLevel;
+        this.raisedLevels = raisedLevels;
     }
 
     /**
@@ -42,16 +42,34 @@ public class CompostItemEvent extends BlockEvent {
      * @return {@code true} if successful
      */
     public boolean willRaiseLevel() {
-        return this.willRaiseLevel;
+        return this.raisedLevels > 0;
     }
 
     /**
      * Sets whether the composter will rise a level.
      *
      * @param willRaiseLevel {@code true} if the composter should rise a level
+     * @deprecated items can now control how many layers they add on click. Use {@link #setLevelsToRaise(int)}.
      */
+    @Deprecated(since = "26.3", forRemoval = true)
     public void setWillRaiseLevel(final boolean willRaiseLevel) {
-        this.willRaiseLevel = willRaiseLevel;
+        this.raisedLevels = willRaiseLevel ? Math.max(1, this.raisedLevels) : 0;
+    }
+
+    /**
+     * {@return the levels the composter will be raised by}
+     */
+    public int getLevelsToRaise() {
+        return this.raisedLevels;
+    }
+
+    /**
+     * Configures the levels the composter will be raised by.
+     *
+     * @param raisedLevels the levels to raise the composter by
+     */
+    public void setLevelsToRaise(final int raisedLevels) {
+        this.raisedLevels = raisedLevels;
     }
 
     @Override

paper-api/src/main/java/io/papermc/paper/event/entity/EntityBreakByEntityEvent.java

@@ -0,0 +1,38 @@
+package io.papermc.paper.event.entity;
+
+import org.bukkit.damage.DamageSource;
+import org.bukkit.entity.Entity;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+@NullMarked
+public class EntityBreakByEntityEvent extends EntityBreakEvent {
+
+    private final Entity remover;
+    private final DamageSource damageSource;
+
+    @ApiStatus.Internal
+    public EntityBreakByEntityEvent(final Entity entity, final Entity remover, final DamageSource damageSource, final RemoveCause cause) {
+        super(entity, cause);
+        this.remover = remover;
+        this.damageSource = damageSource;
+    }
+
+    /**
+     * Gets the entity that removed the entity.
+     *
+     * @return the entity that removed the entity
+     */
+    public Entity getRemover() {
+        return this.remover;
+    }
+
+    /**
+     * Gets the {@link DamageSource} that caused the entity to be removed.
+     *
+     * @return the damage source
+     */
+    public DamageSource getDamageSource() {
+        return this.damageSource;
+    }
+}

paper-api/src/main/java/io/papermc/paper/event/entity/EntityBreakEvent.java

@@ -0,0 +1,78 @@
+package io.papermc.paper.event.entity;
+
+import org.bukkit.entity.Entity;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.entity.EntityEvent;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+// todo javadocs
+@NullMarked
+public class EntityBreakEvent extends EntityEvent implements Cancellable {
+
+    private static final HandlerList HANDLER_LIST = new HandlerList();
+
+    private final RemoveCause cause;
+    private boolean cancelled;
+
+    @ApiStatus.Internal
+    public EntityBreakEvent(final Entity entity, final RemoveCause cause) {
+        super(entity);
+        this.cause = cause;
+    }
+
+    /**
+     * Gets the cause for the entity's removal.
+     *
+     * @return the RemoveCause for the entity's removal
+     */
+    public RemoveCause getCause() {
+        return this.cause;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return this.cancelled;
+    }
+
+    @Override
+    public void setCancelled(final boolean cancel) {
+        this.cancelled = cancel;
+    }
+
+    @Override
+    public HandlerList getHandlers() {
+        return HANDLER_LIST;
+    }
+
+    public static HandlerList getHandlerList() {
+        return HANDLER_LIST;
+    }
+
+    /**
+     * An enum to specify the cause of the removal.
+     */
+    public enum RemoveCause {
+        /**
+         * Removed by an entity.
+         */
+        ENTITY,
+        /**
+         * Removed by an explosion.
+         */
+        EXPLOSION,
+        /**
+         * Removed by placing a block on it.
+         */
+        OBSTRUCTION,
+        /**
+         * Removed by destroying the block behind it, etc.
+         */
+        PHYSICS,
+        /**
+         * Removed by an uncategorised cause.
+         */
+        DEFAULT,
+    }
+}

paper-api/src/main/java/io/papermc/paper/event/entity/EntityCompostItemEvent.java

@@ -18,8 +18,8 @@ public class EntityCompostItemEvent extends CompostItemEvent implements Cancella
     private boolean cancelled;
 
     @ApiStatus.Internal
-    public EntityCompostItemEvent(final Entity entity, final Block composter, final ItemStack item, final boolean willRaiseLevel) {
-        super(composter, item, willRaiseLevel);
+    public EntityCompostItemEvent(final Entity entity, final Block composter, final ItemStack item, final int raisedLevels) {
+        super(composter, item, raisedLevels);
         this.entity = entity;
     }
 

paper-api/src/main/java/io/papermc/paper/event/player/PlayerArmSwingEvent.java

@@ -8,7 +8,7 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 @NullMarked
-public class PlayerArmSwingEvent extends PlayerAnimationEvent { // todo redundant with parent?
+public class PlayerArmSwingEvent extends PlayerAnimationEvent {
 
     private final EquipmentSlot equipmentSlot;
 

paper-api/src/main/java/io/papermc/paper/event/player/PlayerBedFailEnterEvent.java

@@ -35,7 +35,7 @@ public class PlayerBedFailEnterEvent extends PlayerEvent implements Cancellable
     }
 
     /**
-     * @deprecated This enum has been replaced with a system that better
+     * @apiNote This enum has been replaced with a system that better
      * represents how beds work. See {@link #enterAction}
      */
     @ApiStatus.Obsolete(since = "1.21.11")
@@ -98,7 +98,7 @@ public class PlayerBedFailEnterEvent extends PlayerEvent implements Cancellable
     }
 
     /**
-     * @deprecated Enums no longer represents reliably how beds work and fail. This has been
+     * @apiNote Enums no longer represents reliably how beds work and fail. This has been
      * replaced with {@link BedEnterAction} that better fits the new beds
      */
     @ApiStatus.Obsolete(since = "1.21.11")

paper-api/src/main/java/io/papermc/paper/loot/number/ResolvableFloat.java

@@ -0,0 +1,37 @@
+package io.papermc.paper.loot.number;
+
+import org.bukkit.loot.LootContext;
+
+/**
+ * Represents a floating point number that can be resolved against a {@link LootContext}.
+ */
+public interface ResolvableFloat {
+
+    /**
+     * Resolves this floating point number against the given loot context.
+     *
+     * @param context      the loot context to resolve against.
+     * @param defaultValue the default value
+     * @return the resolved number
+     */
+    float resolve(LootContext context, float defaultValue);
+
+    /**
+     * Represents a constant {@link ResolvableFloat}.
+     */
+    interface Constant extends ResolvableFloat {
+
+        /**
+         * @return the constant value
+         */
+        float getValue();
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        default float resolve(LootContext context, float defaultValue) {
+            return this.getValue();
+        }
+    }
+}

paper-api/src/main/java/io/papermc/paper/loot/number/ResolvableInt.java

@@ -0,0 +1,37 @@
+package io.papermc.paper.loot.number;
+
+import org.bukkit.loot.LootContext;
+
+/**
+ * Represents an integer number that can be resolved against a {@link LootContext}.
+ */
+public interface ResolvableInt {
+
+    /**
+     * Resolves this integer number against the given loot context.
+     *
+     * @param context      the loot context to resolve against.
+     * @param defaultValue the default value
+     * @return the resolved number
+     */
+    int resolve(LootContext context, int defaultValue);
+
+    /**
+     * Represents a constant {@link ResolvableInt}.
+     */
+    interface Constant extends ResolvableInt {
+
+        /**
+         * @return the constant value
+         */
+        int getValue();
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        default int resolve(LootContext context, int defaultValue) {
+            return this.getValue();
+        }
+    }
+}

paper-api/src/main/java/io/papermc/paper/loot/number/package-info.java

@@ -0,0 +1,9 @@
+/**
+ * Package containing maths-related API, including position API.
+ */
+@NullMarked
+@ApiStatus.Experimental
+package io.papermc.paper.loot.number;
+
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;

paper-api/src/main/java/io/papermc/paper/potion/PotionMix.java

@@ -5,14 +5,18 @@ import java.util.function.Predicate;
 import org.bukkit.Keyed;
 import org.bukkit.NamespacedKey;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.ItemType;
 import org.bukkit.inventory.RecipeChoice;
 import org.jetbrains.annotations.Contract;
 import org.jspecify.annotations.NullMarked;
 
 /**
  * Represents a potion mix made in a Brewing Stand.
+ *
+ * @deprecated fully replaced by {@link org.bukkit.inventory.BrewingRecipe}
  */
 @NullMarked
+@Deprecated(since = "26.3", forRemoval = true)
 public final class PotionMix implements Keyed {
 
     private final NamespacedKey key;
@@ -41,10 +45,12 @@ public final class PotionMix implements Keyed {
      *
      * @param stackPredicate a predicate for an itemstack.
      * @return a new RecipeChoice
+     * @deprecated use {@link RecipeChoice#predicateChoice(Predicate, ItemStack)}
      */
     @Contract(value = "_ -> new", pure = true)
+    @Deprecated(since = "26.2")
     public static RecipeChoice createPredicateChoice(final Predicate<? super ItemStack> stackPredicate) {
-        return new PredicateRecipeChoice(stackPredicate);
+        return RecipeChoice.predicateChoice(stackPredicate, ItemType.STONE.createItemStack());
     }
 
     @Override

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

@@ -1,5 +1,6 @@
 package io.papermc.paper.registry;
 
+import io.papermc.paper.block.pot.PotPatternType;
 import io.papermc.paper.datacomponent.DataComponentType;
 import io.papermc.paper.dialog.Dialog;
 import io.papermc.paper.entity.poi.PoiType;
@@ -193,6 +194,11 @@ public sealed interface RegistryKey<T> extends Keyed permits RegistryKeyImpl {
      * @see io.papermc.paper.registry.keys.BannerPatternKeys
      */
     RegistryKey<PatternType> BANNER_PATTERN = create("banner_pattern");
+    /**
+     * Data-driven registry for decorated pot patterns.
+     * @see io.papermc.paper.registry.keys.DecoratedPotPatternKeys
+     */
+    RegistryKey<PotPatternType> DECORATED_POT_PATTERN = create("decorated_pot_pattern");
     /**
      * Data-driven registry for painting variants.
      * @see io.papermc.paper.registry.keys.PaintingVariantKeys

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

@@ -0,0 +1,43 @@
+package io.papermc.paper.registry.data;
+
+import io.papermc.paper.block.pot.PotPatternType;
+import io.papermc.paper.registry.RegistryBuilder;
+import net.kyori.adventure.key.Key;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Contract;
+
+/**
+ * A data-centric version-specific registry entry for the {@link PotPatternType} type.
+ */
+@ApiStatus.NonExtendable
+public interface DecoratedPotPatternRegistryEntry {
+
+    /**
+     * Provides the asset id of the pattern type, which is the location of the sprite to use.
+     *
+     * @return the asset id
+     */
+    Key assetId();
+
+    /**
+     * A mutable builder for the {@link DecoratedPotPatternRegistryEntry} plugins may change in applicable registry events.
+     * <p>
+     * The following values are required for each builder:
+     * <ul>
+     *     <li>{@link #assetId(Key)}</li>
+     * </ul>
+     */
+    @ApiStatus.NonExtendable
+    interface Builder extends DecoratedPotPatternRegistryEntry, RegistryBuilder<PotPatternType> {
+
+        /**
+         * Sets the asset id of the pattern type, which is the location of the sprite to use.
+         *
+         * @param assetId the asset id
+         * @return this builder instance
+         * @see DecoratedPotPatternRegistryEntry#assetId()
+         */
+        @Contract(value = "_ -> this", mutates = "this")
+        Builder assetId(Key assetId);
+    }
+}