Use preconditions

Actually do what the last commit said it was doing...

README.md

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

build-data/paper.at

@@ -25,7 +25,6 @@ public net.minecraft.network.chat.numbers.FixedFormat value
 public net.minecraft.network.chat.numbers.StyledFormat style
 public net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket <init>(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/entity/BlockEntityType;Lnet/minecraft/nbt/CompoundTag;)V
 public net.minecraft.network.protocol.game.ClientboundBlockUpdatePacket blockState
-public net.minecraft.network.protocol.game.ClientboundSetDefaultSpawnPositionPacket pos
 public net.minecraft.network.protocol.game.ServerboundMovePlayerPacket hasPos
 public net.minecraft.network.protocol.game.ServerboundMovePlayerPacket hasRot
 public net.minecraft.network.protocol.game.ServerboundMovePlayerPacket x
@@ -42,8 +41,6 @@ public net.minecraft.server.MinecraftServer doRunTask(Lnet/minecraft/server/Tick
 public net.minecraft.server.MinecraftServer executor
 public net.minecraft.server.MinecraftServer fixerUpper
 public net.minecraft.server.MinecraftServer playerDataStorage
-public net.minecraft.server.MinecraftServer prepareLevels(Lnet/minecraft/server/level/progress/ChunkProgressListener;)V
-public net.minecraft.server.MinecraftServer progressListenerFactory
 public net.minecraft.server.MinecraftServer resources
 public net.minecraft.server.MinecraftServer serverThread
 public net.minecraft.server.MinecraftServer$ReloadableResources
@@ -63,7 +60,6 @@ public net.minecraft.server.level.ChunkMap distanceManager
 public net.minecraft.server.level.ChunkMap entityMap
 public net.minecraft.server.level.ChunkMap getVisibleChunkIfPresent(J)Lnet/minecraft/server/level/ChunkHolder;
 public net.minecraft.server.level.ChunkMap level
-public net.minecraft.server.level.ChunkMap progressListener
 public net.minecraft.server.level.ChunkMap save(Lnet/minecraft/world/level/chunk/ChunkAccess;)Z
 public net.minecraft.server.level.ChunkMap serverViewDistance
 public net.minecraft.server.level.ChunkMap setServerViewDistance(I)V
@@ -82,7 +78,6 @@ public net.minecraft.server.level.ServerChunkCache mainThread
 public net.minecraft.server.level.ServerChunkCache mainThreadProcessor
 public net.minecraft.server.level.ServerChunkCache runDistanceManagerUpdates()Z
 public net.minecraft.server.level.ServerChunkCache spawnEnemies
-public net.minecraft.server.level.ServerChunkCache spawnFriendlies
 public net.minecraft.server.level.ServerChunkCache$MainThreadExecutor
 public net.minecraft.server.level.ServerLevel chunkSource
 public net.minecraft.server.level.ServerLevel entityManager
@@ -99,11 +94,12 @@ public net.minecraft.server.level.ServerPlayer lastSentExp
 public net.minecraft.server.level.ServerPlayer nextContainerCounter()V
 public net.minecraft.server.level.ServerPlayer particleStatus
 public net.minecraft.server.level.ServerPlayer seenCredits
+public net.minecraft.server.level.ServerPlayer setShoulderEntityLeft(Lnet/minecraft/nbt/CompoundTag;)V
+public net.minecraft.server.level.ServerPlayer setShoulderEntityRight(Lnet/minecraft/nbt/CompoundTag;)V
 public net.minecraft.server.level.ServerPlayer triggerDimensionChangeTriggers(Lnet/minecraft/server/level/ServerLevel;)V
 public net.minecraft.server.level.ServerPlayer wardenSpawnTracker
 public net.minecraft.server.level.ServerPlayer$RespawnPosAngle
 public net.minecraft.server.level.ServerPlayerGameMode level
-public net.minecraft.server.level.TicketType register(Ljava/lang/String;JZLnet/minecraft/server/level/TicketType$TicketUse;)Lnet/minecraft/server/level/TicketType;
 public net.minecraft.server.network.ServerConfigurationPacketListenerImpl clientInformation
 public net.minecraft.server.network.ServerConfigurationPacketListenerImpl currentTask
 public net.minecraft.server.network.ServerConfigurationPacketListenerImpl finishCurrentTask(Lnet/minecraft/server/network/ConfigurationTask$Type;)V
@@ -149,6 +145,7 @@ public net.minecraft.world.entity.AreaEffectCloud radiusOnUse
 public net.minecraft.world.entity.AreaEffectCloud radiusPerTick
 public net.minecraft.world.entity.AreaEffectCloud reapplicationDelay
 public net.minecraft.world.entity.AreaEffectCloud waitTime
+public net.minecraft.world.entity.Avatar DATA_PLAYER_MODE_CUSTOMISATION
 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;
@@ -345,6 +342,15 @@ public net.minecraft.world.entity.decoration.ItemFrame DATA_ROTATION
 public net.minecraft.world.entity.decoration.ItemFrame dropChance
 public net.minecraft.world.entity.decoration.ItemFrame fixed
 public net.minecraft.world.entity.decoration.ItemFrame setDirection(Lnet/minecraft/core/Direction;)V
+public net.minecraft.world.entity.decoration.Mannequin ALL_LAYERS
+public net.minecraft.world.entity.decoration.Mannequin DEFAULT_DESCRIPTION
+public net.minecraft.world.entity.decoration.Mannequin getDescription()Lnet/minecraft/network/chat/Component;
+public net.minecraft.world.entity.decoration.Mannequin getImmovable()Z
+public net.minecraft.world.entity.decoration.Mannequin getProfile()Lnet/minecraft/world/item/component/ResolvableProfile;
+public net.minecraft.world.entity.decoration.Mannequin setDescription(Lnet/minecraft/network/chat/Component;)V
+public net.minecraft.world.entity.decoration.Mannequin setHideDescription(Z)V
+public net.minecraft.world.entity.decoration.Mannequin setImmovable(Z)V
+public net.minecraft.world.entity.decoration.Mannequin setProfile(Lnet/minecraft/world/item/component/ResolvableProfile;)V
 public net.minecraft.world.entity.decoration.Painting setVariant(Lnet/minecraft/core/Holder;)V
 public net.minecraft.world.entity.item.FallingBlockEntity <init>(Lnet/minecraft/world/level/Level;DDDLnet/minecraft/world/level/block/state/BlockState;)V
 public net.minecraft.world.entity.item.FallingBlockEntity blockState
@@ -422,14 +428,11 @@ public net.minecraft.world.entity.npc.WanderingTrader getWanderTarget()Lnet/mine
 public net.minecraft.world.entity.player.Abilities flyingSpeed
 public net.minecraft.world.entity.player.Abilities walkingSpeed
 public net.minecraft.world.entity.player.Inventory equipment
-public net.minecraft.world.entity.player.Player DATA_PLAYER_MODE_CUSTOMISATION
 public net.minecraft.world.entity.player.Player closeContainer()V
 public net.minecraft.world.entity.player.Player enchantmentSeed
 public net.minecraft.world.entity.player.Player getFireImmuneTicks()I
 public net.minecraft.world.entity.player.Player hurtDir
 public net.minecraft.world.entity.player.Player removeEntitiesOnShoulder()V
-public net.minecraft.world.entity.player.Player setShoulderEntityLeft(Lnet/minecraft/nbt/CompoundTag;)V
-public net.minecraft.world.entity.player.Player setShoulderEntityRight(Lnet/minecraft/nbt/CompoundTag;)V
 public net.minecraft.world.entity.player.Player sleepCounter
 public net.minecraft.world.entity.projectile.AbstractArrow baseDamage
 public net.minecraft.world.entity.projectile.AbstractArrow firedFromWeapon
@@ -496,7 +499,7 @@ public net.minecraft.world.entity.vehicle.AbstractMinecartContainer lootTable
 public net.minecraft.world.entity.vehicle.AbstractMinecartContainer lootTableSeed
 public net.minecraft.world.entity.vehicle.MinecartCommandBlock DATA_ID_COMMAND_NAME
 public net.minecraft.world.entity.vehicle.MinecartFurnace fuel
-public net.minecraft.world.entity.vehicle.MinecartTNT explode(D)V
+public net.minecraft.world.entity.vehicle.MinecartTNT explode(Lnet/minecraft/world/damagesource/DamageSource;D)V
 public net.minecraft.world.entity.vehicle.MinecartTNT explosionPowerBase
 public net.minecraft.world.entity.vehicle.MinecartTNT explosionSpeedFactor
 public net.minecraft.world.entity.vehicle.MinecartTNT fuse
@@ -542,6 +545,11 @@ public net.minecraft.world.item.StandingAndWallBlockItem wallBlock
 public net.minecraft.world.item.component.BundleContents$Mutable getMaxAmountToAdd(Lnet/minecraft/world/item/ItemStack;)I
 public net.minecraft.world.item.component.ItemContainerContents MAX_SIZE
 public net.minecraft.world.item.component.ItemContainerContents items
+public net.minecraft.world.item.component.ResolvableProfile unpack()Lcom/mojang/datafixers/util/Either;
+public net.minecraft.world.item.component.ResolvableProfile$Dynamic <init>(Lcom/mojang/datafixers/util/Either;Lnet/minecraft/world/entity/player/PlayerSkin$Patch;)V
+public net.minecraft.world.item.component.ResolvableProfile$Partial
+public net.minecraft.world.item.component.ResolvableProfile$Partial MAP_CODEC
+public net.minecraft.world.item.component.ResolvableProfile$Static <init>(Lcom/mojang/datafixers/util/Either;Lnet/minecraft/world/entity/player/PlayerSkin$Patch;)V
 public net.minecraft.world.item.context.UseOnContext <init>(Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/phys/BlockHitResult;)V
 public net.minecraft.world.item.crafting.RecipeManager recipes
 public net.minecraft.world.item.crafting.RecipeMap byKey
@@ -565,6 +573,7 @@ public net.minecraft.world.level.BaseSpawner spawnRange
 public net.minecraft.world.level.GameRules GAME_RULE_TYPES
 public net.minecraft.world.level.GameRules$Value deserialize(Ljava/lang/String;)V
 public net.minecraft.world.level.GameRules$Value onChanged(Lnet/minecraft/server/MinecraftServer;)V
+public net.minecraft.world.level.Level DEFAULT_EXPLOSION_BLOCK_PARTICLES
 public net.minecraft.world.level.Level blockEntityTickers
 public net.minecraft.world.level.Level getEntities()Lnet/minecraft/world/level/entity/LevelEntityGetter;
 public net.minecraft.world.level.Level levelData
@@ -579,8 +588,6 @@ public net.minecraft.world.level.biome.Biome getTemperature(Lnet/minecraft/core/
 public net.minecraft.world.level.biome.Biome$ClimateSettings
 public net.minecraft.world.level.block.Block popExperience(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;I)V
 public net.minecraft.world.level.block.ChestBlock isBlockedChestByBlock(Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Z
-public net.minecraft.world.level.block.ChiseledBookShelfBlock getHitSlot(Lnet/minecraft/world/phys/BlockHitResult;Lnet/minecraft/world/level/block/state/BlockState;)Ljava/util/OptionalInt;
-public net.minecraft.world.level.block.ChiseledBookShelfBlock getSection(F)I
 public net.minecraft.world.level.block.ComposterBlock$EmptyContainer
 public net.minecraft.world.level.block.ComposterBlock$InputContainer
 public net.minecraft.world.level.block.ComposterBlock$OutputContainer
@@ -589,6 +596,7 @@ public net.minecraft.world.level.block.DropperBlock dispenseFrom(Lnet/minecraft/
 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.SelectableSlotContainer getSection(FI)I
 public net.minecraft.world.level.block.ShulkerBoxBlock color
 public net.minecraft.world.level.block.SoundType breakSound
 public net.minecraft.world.level.block.SoundType hitSound
@@ -622,6 +630,7 @@ public net.minecraft.world.level.block.entity.BrushableBlockEntity lootTable
 public net.minecraft.world.level.block.entity.BrushableBlockEntity lootTableSeed
 public net.minecraft.world.level.block.entity.CampfireBlockEntity cookingProgress
 public net.minecraft.world.level.block.entity.CampfireBlockEntity cookingTime
+public net.minecraft.world.level.block.entity.ChestBlockEntity DEFAULT_NAME
 public net.minecraft.world.level.block.entity.ChestBlockEntity openersCounter
 public net.minecraft.world.level.block.entity.ChestBlockEntity playSound(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/sounds/SoundEvent;)V
 public net.minecraft.world.level.block.entity.ChiseledBookShelfBlockEntity lastInteractedSlot
@@ -688,12 +697,10 @@ public net.minecraft.world.level.chunk.ChunkGenerator generationSettingsGetter
 public net.minecraft.world.level.chunk.LevelChunk level
 public net.minecraft.world.level.chunk.LevelChunk loaded
 public net.minecraft.world.level.chunk.LevelChunkSection states
-public net.minecraft.world.level.chunk.PalettedContainer registry
 public net.minecraft.world.level.chunk.status.ChunkStatusTasks postLoadProtoChunk(Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/storage/ValueInput$ValueInputList;)V
 public net.minecraft.world.level.chunk.storage.EntityStorage entityDeserializerQueue
 public net.minecraft.world.level.chunk.storage.EntityStorage level
 public net.minecraft.world.level.chunk.storage.RegionFileStorage regionCache
-public net.minecraft.world.level.chunk.storage.SerializableChunkData BLOCK_STATE_CODEC
 public net.minecraft.world.level.dimension.end.EndDragonFight GATEWAY_COUNT
 public net.minecraft.world.level.dimension.end.EndDragonFight dragonEvent
 public net.minecraft.world.level.dimension.end.EndDragonFight dragonUUID
@@ -754,7 +761,6 @@ public-f net.minecraft.server.ReloadableServerResources commands
 public-f net.minecraft.server.dedicated.DedicatedServer serverLinks
 public-f net.minecraft.server.dedicated.DedicatedServer settings
 public-f net.minecraft.server.dedicated.DedicatedServerProperties pauseWhenEmptySeconds
-public-f net.minecraft.server.players.PlayerList maxPlayers
 public-f net.minecraft.world.entity.LivingEntity combatTracker
 public-f net.minecraft.world.entity.LivingEntity invulnerableDuration
 public-f net.minecraft.world.entity.Mob goalSelector

build-data/reobf-mappings-patch.tiny

@@ -14,14 +14,14 @@ tiny	2	0	mojang	spigot
 
 # CraftBukkit changes type
 c	net/minecraft/server/level/ServerLevel	net/minecraft/server/level/WorldServer
-	f	Lnet/minecraft/world/level/storage/PrimaryLevelData;	serverLevelData	L
+	f	Lnet/minecraft/world/level/storage/PrimaryLevelData;	serverLevelData	J
 
 c	net/minecraft/world/level/chunk/LevelChunk	net/minecraft/world/level/chunk/Chunk
-	f	Lnet/minecraft/server/level/ServerLevel;	level	r
+	f	Lnet/minecraft/server/level/ServerLevel;	level	q
 
 # See mappings-patch.tiny
 c	net/minecraft/server/level/ChunkMap	net/minecraft/server/level/PlayerChunkMap
-	f	Lnet/minecraft/server/level/ChunkMap$ChunkDistanceManager;	distanceManager	H
+	f	Lnet/minecraft/server/level/ChunkMap$ChunkDistanceManager;	distanceManager	G
 
 # The method is made public by Spigot, which then causes accidental overrides
 c	net/minecraft/world/entity/Entity	net/minecraft/world/entity/Entity

build.gradle.kts

@@ -2,7 +2,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.18" apply false
+    id("io.papermc.paperweight.core") version "2.0.0-beta.19" apply false
 }
 
 subprojects {
@@ -51,7 +51,7 @@ subprojects {
 
     extensions.configure<PublishingExtension> {
         repositories {
-            maven("https://repo.papermc.io/repository/maven-snapshots/") {
+            maven("https://artifactory.papermc.io/artifactory/snapshots/") {
                 name = "paperSnapshots"
                 credentials(PasswordCredentials::class)
             }

gradle.properties

@@ -1,6 +1,6 @@
 group=io.papermc.paper
-version=1.21.8-R0.1-SNAPSHOT
-mcVersion=1.21.8
+version=1.21.10-R0.1-SNAPSHOT
+mcVersion=1.21.10
 
 # Set to true while updating Minecraft version
 updatingMinecraft=false

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 

gradlew.bat

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

paper-api/build.gradle.kts

@@ -10,8 +10,7 @@ java {
 }
 
 val annotationsVersion = "26.0.2"
-// Keep in sync with paper-server adventure-text-serializer-ansi dep
-val adventureVersion = "4.24.0"
+val adventureVersion = "4.25.0"
 val bungeeCordChatVersion = "1.21-R0.2-deprecated+build.21"
 val slf4jVersion = "2.0.16"
 val log4jVersion = "2.24.1"
@@ -171,10 +170,10 @@ tasks.withType<Javadoc>().configureEach {
     options.isDocFilesSubDirs = true
     options.links(
         "https://guava.dev/releases/33.3.1-jre/api/docs/",
-        "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
-        "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/",
-        "https://javadoc.io/doc/org.joml/joml/1.10.8/",
-        "https://www.javadoc.io/doc/com.google.code.gson/gson/2.11.0",
+        //"https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
+        //"https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/",
+        //"https://javadoc.io/doc/org.joml/joml/1.10.8/",
+        //"https://www.javadoc.io/doc/com.google.code.gson/gson/2.11.0",
         "https://jspecify.dev/docs/api/",
         "https://jd.advntr.dev/api/$adventureVersion/",
         "https://jd.advntr.dev/key/$adventureVersion/",
@@ -183,9 +182,9 @@ tasks.withType<Javadoc>().configureEach {
         "https://jd.advntr.dev/text-serializer-legacy/$adventureVersion/",
         "https://jd.advntr.dev/text-serializer-plain/$adventureVersion/",
         "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/",
-        "https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/",
+        //"https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/",
         "https://logging.apache.org/log4j/2.x/javadoc/log4j-api/",
-        "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.7.3",
+        //"https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.7.3",
     )
     options.tags("apiNote:a:API Note:")
 
@@ -233,15 +232,3 @@ val scanJarForBadCalls by tasks.registering(io.papermc.paperweight.tasks.ScanJar
 tasks.check {
     dependsOn(scanJarForBadCalls)
 }
-
-if (providers.gradleProperty("updatingMinecraft").getOrElse("false").toBoolean()) {
-    val scanJarForOldGeneratedCode by tasks.registering(io.papermc.paperweight.tasks.ScanJarForOldGeneratedCode::class) {
-        mcVersion.set(providers.gradleProperty("mcVersion"))
-        annotation.set("Lio/papermc/paper/generated/GeneratedFrom;")
-        jarToScan.set(tasks.jar.flatMap { it.archiveFile })
-        classpath.from(configurations.compileClasspath)
-    }
-    tasks.check {
-        dependsOn(scanJarForOldGeneratedCode)
-    }
-}

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

@@ -1,8 +1,8 @@
 package com.destroystokyo.paper.entity.ai;
 
 import com.destroystokyo.paper.entity.RangedEntity;
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.entity.SchoolableFish;
-import io.papermc.paper.generated.GeneratedFrom;
 import org.bukkit.NamespacedKey;
 import org.bukkit.entity.AbstractHorse;
 import org.bukkit.entity.AbstractSkeleton;
@@ -68,7 +68,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.8")
+@GeneratedClass
 public interface VanillaGoal<T extends Mob> extends Goal<T> {
     GoalKey<AbstractHorse> HORSE_RANDOM_STAND = create("horse_random_stand", AbstractHorse.class);
 

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

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

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

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

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

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

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

@@ -2,7 +2,7 @@ package io.papermc.paper.registry.keys;
 
 import static net.kyori.adventure.key.Key.key;
 
-import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.8")
+@GeneratedClass
 public final class BlockTypeKeys {
     /**
      * {@code minecraft:acacia_button}
@@ -95,6 +95,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> ACACIA_SAPLING = create(key("acacia_sapling"));
 
+    /**
+     * {@code minecraft:acacia_shelf}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> ACACIA_SHELF = create(key("acacia_shelf"));
+
     /**
      * {@code minecraft:acacia_sign}
      *
@@ -347,6 +354,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> BAMBOO_SAPLING = create(key("bamboo_sapling"));
 
+    /**
+     * {@code minecraft:bamboo_shelf}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> BAMBOO_SHELF = create(key("bamboo_shelf"));
+
     /**
      * {@code minecraft:bamboo_sign}
      *
@@ -536,6 +550,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> BIRCH_SAPLING = create(key("birch_sapling"));
 
+    /**
+     * {@code minecraft:birch_shelf}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> BIRCH_SHELF = create(key("birch_shelf"));
+
     /**
      * {@code minecraft:birch_sign}
      *
@@ -1173,13 +1194,6 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> CAVE_VINES_PLANT = create(key("cave_vines_plant"));
 
-    /**
-     * {@code minecraft:chain}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<BlockType> CHAIN = create(key("chain"));
-
     /**
      * {@code minecraft:chain_command_block}
      *
@@ -1257,6 +1271,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> CHERRY_SAPLING = create(key("cherry_sapling"));
 
+    /**
+     * {@code minecraft:cherry_shelf}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> CHERRY_SHELF = create(key("cherry_shelf"));
+
     /**
      * {@code minecraft:cherry_sign}
      *
@@ -1551,6 +1572,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> CONDUIT = create(key("conduit"));
 
+    /**
+     * {@code minecraft:copper_bars}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> COPPER_BARS = create(key("copper_bars"));
+
     /**
      * {@code minecraft:copper_block}
      *
@@ -1565,6 +1593,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> COPPER_BULB = create(key("copper_bulb"));
 
+    /**
+     * {@code minecraft:copper_chain}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> COPPER_CHAIN = create(key("copper_chain"));
+
+    /**
+     * {@code minecraft:copper_chest}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> COPPER_CHEST = create(key("copper_chest"));
+
     /**
      * {@code minecraft:copper_door}
      *
@@ -1572,6 +1614,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> COPPER_DOOR = create(key("copper_door"));
 
+    /**
+     * {@code minecraft:copper_golem_statue}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> COPPER_GOLEM_STATUE = create(key("copper_golem_statue"));
+
     /**
      * {@code minecraft:copper_grate}
      *
@@ -1579,6 +1628,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> COPPER_GRATE = create(key("copper_grate"));
 
+    /**
+     * {@code minecraft:copper_lantern}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> COPPER_LANTERN = create(key("copper_lantern"));
+
     /**
      * {@code minecraft:copper_ore}
      *
@@ -1586,6 +1642,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> COPPER_ORE = create(key("copper_ore"));
 
+    /**
+     * {@code minecraft:copper_torch}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> COPPER_TORCH = create(key("copper_torch"));
+
     /**
      * {@code minecraft:copper_trapdoor}
      *
@@ -1593,6 +1656,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> COPPER_TRAPDOOR = create(key("copper_trapdoor"));
 
+    /**
+     * {@code minecraft:copper_wall_torch}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> COPPER_WALL_TORCH = create(key("copper_wall_torch"));
+
     /**
      * {@code minecraft:cornflower}
      *
@@ -1747,6 +1817,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> CRIMSON_ROOTS = create(key("crimson_roots"));
 
+    /**
+     * {@code minecraft:crimson_shelf}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> CRIMSON_SHELF = create(key("crimson_shelf"));
+
     /**
      * {@code minecraft:crimson_sign}
      *
@@ -2034,6 +2111,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> DARK_OAK_SAPLING = create(key("dark_oak_sapling"));
 
+    /**
+     * {@code minecraft:dark_oak_shelf}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> DARK_OAK_SHELF = create(key("dark_oak_shelf"));
+
     /**
      * {@code minecraft:dark_oak_sign}
      *
@@ -2608,6 +2692,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> EXPOSED_COPPER = create(key("exposed_copper"));
 
+    /**
+     * {@code minecraft:exposed_copper_bars}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> EXPOSED_COPPER_BARS = create(key("exposed_copper_bars"));
+
     /**
      * {@code minecraft:exposed_copper_bulb}
      *
@@ -2615,6 +2706,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> EXPOSED_COPPER_BULB = create(key("exposed_copper_bulb"));
 
+    /**
+     * {@code minecraft:exposed_copper_chain}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> EXPOSED_COPPER_CHAIN = create(key("exposed_copper_chain"));
+
+    /**
+     * {@code minecraft:exposed_copper_chest}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> EXPOSED_COPPER_CHEST = create(key("exposed_copper_chest"));
+
     /**
      * {@code minecraft:exposed_copper_door}
      *
@@ -2622,6 +2727,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> EXPOSED_COPPER_DOOR = create(key("exposed_copper_door"));
 
+    /**
+     * {@code minecraft:exposed_copper_golem_statue}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> EXPOSED_COPPER_GOLEM_STATUE = create(key("exposed_copper_golem_statue"));
+
     /**
      * {@code minecraft:exposed_copper_grate}
      *
@@ -2629,6 +2741,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> EXPOSED_COPPER_GRATE = create(key("exposed_copper_grate"));
 
+    /**
+     * {@code minecraft:exposed_copper_lantern}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> EXPOSED_COPPER_LANTERN = create(key("exposed_copper_lantern"));
+
     /**
      * {@code minecraft:exposed_copper_trapdoor}
      *
@@ -2657,6 +2776,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> EXPOSED_CUT_COPPER_STAIRS = create(key("exposed_cut_copper_stairs"));
 
+    /**
+     * {@code minecraft:exposed_lightning_rod}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> EXPOSED_LIGHTNING_ROD = create(key("exposed_lightning_rod"));
+
     /**
      * {@code minecraft:farmland}
      *
@@ -3203,6 +3329,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> IRON_BLOCK = create(key("iron_block"));
 
+    /**
+     * {@code minecraft:iron_chain}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> IRON_CHAIN = create(key("iron_chain"));
+
     /**
      * {@code minecraft:iron_door}
      *
@@ -3315,6 +3448,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> JUNGLE_SAPLING = create(key("jungle_sapling"));
 
+    /**
+     * {@code minecraft:jungle_shelf}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> JUNGLE_SHELF = create(key("jungle_shelf"));
+
     /**
      * {@code minecraft:jungle_sign}
      *
@@ -3987,6 +4127,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> MANGROVE_ROOTS = create(key("mangrove_roots"));
 
+    /**
+     * {@code minecraft:mangrove_shelf}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> MANGROVE_SHELF = create(key("mangrove_shelf"));
+
     /**
      * {@code minecraft:mangrove_sign}
      *
@@ -4358,6 +4505,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> OAK_SAPLING = create(key("oak_sapling"));
 
+    /**
+     * {@code minecraft:oak_shelf}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> OAK_SHELF = create(key("oak_shelf"));
+
     /**
      * {@code minecraft:oak_sign}
      *
@@ -4561,6 +4715,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> OXIDIZED_COPPER = create(key("oxidized_copper"));
 
+    /**
+     * {@code minecraft:oxidized_copper_bars}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> OXIDIZED_COPPER_BARS = create(key("oxidized_copper_bars"));
+
     /**
      * {@code minecraft:oxidized_copper_bulb}
      *
@@ -4568,6 +4729,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> OXIDIZED_COPPER_BULB = create(key("oxidized_copper_bulb"));
 
+    /**
+     * {@code minecraft:oxidized_copper_chain}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> OXIDIZED_COPPER_CHAIN = create(key("oxidized_copper_chain"));
+
+    /**
+     * {@code minecraft:oxidized_copper_chest}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> OXIDIZED_COPPER_CHEST = create(key("oxidized_copper_chest"));
+
     /**
      * {@code minecraft:oxidized_copper_door}
      *
@@ -4575,6 +4750,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> OXIDIZED_COPPER_DOOR = create(key("oxidized_copper_door"));
 
+    /**
+     * {@code minecraft:oxidized_copper_golem_statue}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> OXIDIZED_COPPER_GOLEM_STATUE = create(key("oxidized_copper_golem_statue"));
+
     /**
      * {@code minecraft:oxidized_copper_grate}
      *
@@ -4582,6 +4764,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> OXIDIZED_COPPER_GRATE = create(key("oxidized_copper_grate"));
 
+    /**
+     * {@code minecraft:oxidized_copper_lantern}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> OXIDIZED_COPPER_LANTERN = create(key("oxidized_copper_lantern"));
+
     /**
      * {@code minecraft:oxidized_copper_trapdoor}
      *
@@ -4610,6 +4799,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> OXIDIZED_CUT_COPPER_STAIRS = create(key("oxidized_cut_copper_stairs"));
 
+    /**
+     * {@code minecraft:oxidized_lightning_rod}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> OXIDIZED_LIGHTNING_ROD = create(key("oxidized_lightning_rod"));
+
     /**
      * {@code minecraft:packed_ice}
      *
@@ -4715,6 +4911,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> PALE_OAK_SAPLING = create(key("pale_oak_sapling"));
 
+    /**
+     * {@code minecraft:pale_oak_shelf}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> PALE_OAK_SHELF = create(key("pale_oak_shelf"));
+
     /**
      * {@code minecraft:pale_oak_sign}
      *
@@ -6437,6 +6640,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> SPRUCE_SAPLING = create(key("spruce_sapling"));
 
+    /**
+     * {@code minecraft:spruce_shelf}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> SPRUCE_SHELF = create(key("spruce_shelf"));
+
     /**
      * {@code minecraft:spruce_sign}
      *
@@ -7102,6 +7312,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> WARPED_ROOTS = create(key("warped_roots"));
 
+    /**
+     * {@code minecraft:warped_shelf}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WARPED_SHELF = create(key("warped_shelf"));
+
     /**
      * {@code minecraft:warped_sign}
      *
@@ -7179,6 +7396,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> WAXED_CHISELED_COPPER = create(key("waxed_chiseled_copper"));
 
+    /**
+     * {@code minecraft:waxed_copper_bars}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WAXED_COPPER_BARS = create(key("waxed_copper_bars"));
+
     /**
      * {@code minecraft:waxed_copper_block}
      *
@@ -7193,6 +7417,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> WAXED_COPPER_BULB = create(key("waxed_copper_bulb"));
 
+    /**
+     * {@code minecraft:waxed_copper_chain}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WAXED_COPPER_CHAIN = create(key("waxed_copper_chain"));
+
+    /**
+     * {@code minecraft:waxed_copper_chest}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WAXED_COPPER_CHEST = create(key("waxed_copper_chest"));
+
     /**
      * {@code minecraft:waxed_copper_door}
      *
@@ -7200,6 +7438,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> WAXED_COPPER_DOOR = create(key("waxed_copper_door"));
 
+    /**
+     * {@code minecraft:waxed_copper_golem_statue}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WAXED_COPPER_GOLEM_STATUE = create(key("waxed_copper_golem_statue"));
+
     /**
      * {@code minecraft:waxed_copper_grate}
      *
@@ -7207,6 +7452,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> WAXED_COPPER_GRATE = create(key("waxed_copper_grate"));
 
+    /**
+     * {@code minecraft:waxed_copper_lantern}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WAXED_COPPER_LANTERN = create(key("waxed_copper_lantern"));
+
     /**
      * {@code minecraft:waxed_copper_trapdoor}
      *
@@ -7249,6 +7501,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> WAXED_EXPOSED_COPPER = create(key("waxed_exposed_copper"));
 
+    /**
+     * {@code minecraft:waxed_exposed_copper_bars}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WAXED_EXPOSED_COPPER_BARS = create(key("waxed_exposed_copper_bars"));
+
     /**
      * {@code minecraft:waxed_exposed_copper_bulb}
      *
@@ -7256,6 +7515,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> WAXED_EXPOSED_COPPER_BULB = create(key("waxed_exposed_copper_bulb"));
 
+    /**
+     * {@code minecraft:waxed_exposed_copper_chain}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WAXED_EXPOSED_COPPER_CHAIN = create(key("waxed_exposed_copper_chain"));
+
+    /**
+     * {@code minecraft:waxed_exposed_copper_chest}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WAXED_EXPOSED_COPPER_CHEST = create(key("waxed_exposed_copper_chest"));
+
     /**
      * {@code minecraft:waxed_exposed_copper_door}
      *
@@ -7263,6 +7536,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> WAXED_EXPOSED_COPPER_DOOR = create(key("waxed_exposed_copper_door"));
 
+    /**
+     * {@code minecraft:waxed_exposed_copper_golem_statue}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WAXED_EXPOSED_COPPER_GOLEM_STATUE = create(key("waxed_exposed_copper_golem_statue"));
+
     /**
      * {@code minecraft:waxed_exposed_copper_grate}
      *
@@ -7270,6 +7550,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> WAXED_EXPOSED_COPPER_GRATE = create(key("waxed_exposed_copper_grate"));
 
+    /**
+     * {@code minecraft:waxed_exposed_copper_lantern}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WAXED_EXPOSED_COPPER_LANTERN = create(key("waxed_exposed_copper_lantern"));
+
     /**
      * {@code minecraft:waxed_exposed_copper_trapdoor}
      *
@@ -7298,6 +7585,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> WAXED_EXPOSED_CUT_COPPER_STAIRS = create(key("waxed_exposed_cut_copper_stairs"));
 
+    /**
+     * {@code minecraft:waxed_exposed_lightning_rod}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WAXED_EXPOSED_LIGHTNING_ROD = create(key("waxed_exposed_lightning_rod"));
+
+    /**
+     * {@code minecraft:waxed_lightning_rod}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WAXED_LIGHTNING_ROD = create(key("waxed_lightning_rod"));
+
     /**
      * {@code minecraft:waxed_oxidized_chiseled_copper}
      *
@@ -7312,6 +7613,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> WAXED_OXIDIZED_COPPER = create(key("waxed_oxidized_copper"));
 
+    /**
+     * {@code minecraft:waxed_oxidized_copper_bars}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WAXED_OXIDIZED_COPPER_BARS = create(key("waxed_oxidized_copper_bars"));
+
     /**
      * {@code minecraft:waxed_oxidized_copper_bulb}
      *
@@ -7319,6 +7627,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> WAXED_OXIDIZED_COPPER_BULB = create(key("waxed_oxidized_copper_bulb"));
 
+    /**
+     * {@code minecraft:waxed_oxidized_copper_chain}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WAXED_OXIDIZED_COPPER_CHAIN = create(key("waxed_oxidized_copper_chain"));
+
+    /**
+     * {@code minecraft:waxed_oxidized_copper_chest}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WAXED_OXIDIZED_COPPER_CHEST = create(key("waxed_oxidized_copper_chest"));
+
     /**
      * {@code minecraft:waxed_oxidized_copper_door}
      *
@@ -7326,6 +7648,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> WAXED_OXIDIZED_COPPER_DOOR = create(key("waxed_oxidized_copper_door"));
 
+    /**
+     * {@code minecraft:waxed_oxidized_copper_golem_statue}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WAXED_OXIDIZED_COPPER_GOLEM_STATUE = create(key("waxed_oxidized_copper_golem_statue"));
+
     /**
      * {@code minecraft:waxed_oxidized_copper_grate}
      *
@@ -7333,6 +7662,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> WAXED_OXIDIZED_COPPER_GRATE = create(key("waxed_oxidized_copper_grate"));
 
+    /**
+     * {@code minecraft:waxed_oxidized_copper_lantern}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WAXED_OXIDIZED_COPPER_LANTERN = create(key("waxed_oxidized_copper_lantern"));
+
     /**
      * {@code minecraft:waxed_oxidized_copper_trapdoor}
      *
@@ -7361,6 +7697,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> WAXED_OXIDIZED_CUT_COPPER_STAIRS = create(key("waxed_oxidized_cut_copper_stairs"));
 
+    /**
+     * {@code minecraft:waxed_oxidized_lightning_rod}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WAXED_OXIDIZED_LIGHTNING_ROD = create(key("waxed_oxidized_lightning_rod"));
+
     /**
      * {@code minecraft:waxed_weathered_chiseled_copper}
      *
@@ -7375,6 +7718,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> WAXED_WEATHERED_COPPER = create(key("waxed_weathered_copper"));
 
+    /**
+     * {@code minecraft:waxed_weathered_copper_bars}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WAXED_WEATHERED_COPPER_BARS = create(key("waxed_weathered_copper_bars"));
+
     /**
      * {@code minecraft:waxed_weathered_copper_bulb}
      *
@@ -7382,6 +7732,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> WAXED_WEATHERED_COPPER_BULB = create(key("waxed_weathered_copper_bulb"));
 
+    /**
+     * {@code minecraft:waxed_weathered_copper_chain}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WAXED_WEATHERED_COPPER_CHAIN = create(key("waxed_weathered_copper_chain"));
+
+    /**
+     * {@code minecraft:waxed_weathered_copper_chest}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WAXED_WEATHERED_COPPER_CHEST = create(key("waxed_weathered_copper_chest"));
+
     /**
      * {@code minecraft:waxed_weathered_copper_door}
      *
@@ -7389,6 +7753,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> WAXED_WEATHERED_COPPER_DOOR = create(key("waxed_weathered_copper_door"));
 
+    /**
+     * {@code minecraft:waxed_weathered_copper_golem_statue}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WAXED_WEATHERED_COPPER_GOLEM_STATUE = create(key("waxed_weathered_copper_golem_statue"));
+
     /**
      * {@code minecraft:waxed_weathered_copper_grate}
      *
@@ -7396,6 +7767,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> WAXED_WEATHERED_COPPER_GRATE = create(key("waxed_weathered_copper_grate"));
 
+    /**
+     * {@code minecraft:waxed_weathered_copper_lantern}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WAXED_WEATHERED_COPPER_LANTERN = create(key("waxed_weathered_copper_lantern"));
+
     /**
      * {@code minecraft:waxed_weathered_copper_trapdoor}
      *
@@ -7424,6 +7802,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> WAXED_WEATHERED_CUT_COPPER_STAIRS = create(key("waxed_weathered_cut_copper_stairs"));
 
+    /**
+     * {@code minecraft:waxed_weathered_lightning_rod}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WAXED_WEATHERED_LIGHTNING_ROD = create(key("waxed_weathered_lightning_rod"));
+
     /**
      * {@code minecraft:weathered_chiseled_copper}
      *
@@ -7438,6 +7823,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> WEATHERED_COPPER = create(key("weathered_copper"));
 
+    /**
+     * {@code minecraft:weathered_copper_bars}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WEATHERED_COPPER_BARS = create(key("weathered_copper_bars"));
+
     /**
      * {@code minecraft:weathered_copper_bulb}
      *
@@ -7445,6 +7837,20 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> WEATHERED_COPPER_BULB = create(key("weathered_copper_bulb"));
 
+    /**
+     * {@code minecraft:weathered_copper_chain}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WEATHERED_COPPER_CHAIN = create(key("weathered_copper_chain"));
+
+    /**
+     * {@code minecraft:weathered_copper_chest}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WEATHERED_COPPER_CHEST = create(key("weathered_copper_chest"));
+
     /**
      * {@code minecraft:weathered_copper_door}
      *
@@ -7452,6 +7858,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> WEATHERED_COPPER_DOOR = create(key("weathered_copper_door"));
 
+    /**
+     * {@code minecraft:weathered_copper_golem_statue}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WEATHERED_COPPER_GOLEM_STATUE = create(key("weathered_copper_golem_statue"));
+
     /**
      * {@code minecraft:weathered_copper_grate}
      *
@@ -7459,6 +7872,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> WEATHERED_COPPER_GRATE = create(key("weathered_copper_grate"));
 
+    /**
+     * {@code minecraft:weathered_copper_lantern}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WEATHERED_COPPER_LANTERN = create(key("weathered_copper_lantern"));
+
     /**
      * {@code minecraft:weathered_copper_trapdoor}
      *
@@ -7487,6 +7907,13 @@ public final class BlockTypeKeys {
      */
     public static final TypedKey<BlockType> WEATHERED_CUT_COPPER_STAIRS = create(key("weathered_cut_copper_stairs"));
 
+    /**
+     * {@code minecraft:weathered_lightning_rod}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<BlockType> WEATHERED_LIGHTNING_ROD = create(key("weathered_lightning_rod"));
+
     /**
      * {@code minecraft:weeping_vines}
      *

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -2,7 +2,7 @@ package io.papermc.paper.registry.keys;
 
 import static net.kyori.adventure.key.Key.key;
 
-import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.8")
+@GeneratedClass
 public final class ItemTypeKeys {
     /**
      * {@code minecraft:acacia_boat}
@@ -109,6 +109,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> ACACIA_SAPLING = create(key("acacia_sapling"));
 
+    /**
+     * {@code minecraft:acacia_shelf}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> ACACIA_SHELF = create(key("acacia_shelf"));
+
     /**
      * {@code minecraft:acacia_sign}
      *
@@ -431,6 +438,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> BAMBOO_RAFT = create(key("bamboo_raft"));
 
+    /**
+     * {@code minecraft:bamboo_shelf}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> BAMBOO_SHELF = create(key("bamboo_shelf"));
+
     /**
      * {@code minecraft:bamboo_sign}
      *
@@ -648,6 +662,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> BIRCH_SAPLING = create(key("birch_sapling"));
 
+    /**
+     * {@code minecraft:birch_shelf}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> BIRCH_SHELF = create(key("birch_shelf"));
+
     /**
      * {@code minecraft:birch_sign}
      *
@@ -1432,13 +1453,6 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> CAVE_SPIDER_SPAWN_EGG = create(key("cave_spider_spawn_egg"));
 
-    /**
-     * {@code minecraft:chain}
-     *
-     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
-     */
-    public static final TypedKey<ItemType> CHAIN = create(key("chain"));
-
     /**
      * {@code minecraft:chain_command_block}
      *
@@ -1565,6 +1579,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> CHERRY_SAPLING = create(key("cherry_sapling"));
 
+    /**
+     * {@code minecraft:cherry_shelf}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> CHERRY_SHELF = create(key("cherry_shelf"));
+
     /**
      * {@code minecraft:cherry_sign}
      *
@@ -1992,6 +2013,20 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> COOKIE = create(key("cookie"));
 
+    /**
+     * {@code minecraft:copper_axe}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> COPPER_AXE = create(key("copper_axe"));
+
+    /**
+     * {@code minecraft:copper_bars}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> COPPER_BARS = create(key("copper_bars"));
+
     /**
      * {@code minecraft:copper_block}
      *
@@ -1999,6 +2034,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> COPPER_BLOCK = create(key("copper_block"));
 
+    /**
+     * {@code minecraft:copper_boots}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> COPPER_BOOTS = create(key("copper_boots"));
+
     /**
      * {@code minecraft:copper_bulb}
      *
@@ -2006,6 +2048,27 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> COPPER_BULB = create(key("copper_bulb"));
 
+    /**
+     * {@code minecraft:copper_chain}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> COPPER_CHAIN = create(key("copper_chain"));
+
+    /**
+     * {@code minecraft:copper_chest}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> COPPER_CHEST = create(key("copper_chest"));
+
+    /**
+     * {@code minecraft:copper_chestplate}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> COPPER_CHESTPLATE = create(key("copper_chestplate"));
+
     /**
      * {@code minecraft:copper_door}
      *
@@ -2013,6 +2076,20 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> COPPER_DOOR = create(key("copper_door"));
 
+    /**
+     * {@code minecraft:copper_golem_spawn_egg}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> COPPER_GOLEM_SPAWN_EGG = create(key("copper_golem_spawn_egg"));
+
+    /**
+     * {@code minecraft:copper_golem_statue}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> COPPER_GOLEM_STATUE = create(key("copper_golem_statue"));
+
     /**
      * {@code minecraft:copper_grate}
      *
@@ -2020,6 +2097,27 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> COPPER_GRATE = create(key("copper_grate"));
 
+    /**
+     * {@code minecraft:copper_helmet}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> COPPER_HELMET = create(key("copper_helmet"));
+
+    /**
+     * {@code minecraft:copper_hoe}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> COPPER_HOE = create(key("copper_hoe"));
+
+    /**
+     * {@code minecraft:copper_horse_armor}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> COPPER_HORSE_ARMOR = create(key("copper_horse_armor"));
+
     /**
      * {@code minecraft:copper_ingot}
      *
@@ -2027,6 +2125,27 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> COPPER_INGOT = create(key("copper_ingot"));
 
+    /**
+     * {@code minecraft:copper_lantern}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> COPPER_LANTERN = create(key("copper_lantern"));
+
+    /**
+     * {@code minecraft:copper_leggings}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> COPPER_LEGGINGS = create(key("copper_leggings"));
+
+    /**
+     * {@code minecraft:copper_nugget}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> COPPER_NUGGET = create(key("copper_nugget"));
+
     /**
      * {@code minecraft:copper_ore}
      *
@@ -2034,6 +2153,34 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> COPPER_ORE = create(key("copper_ore"));
 
+    /**
+     * {@code minecraft:copper_pickaxe}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> COPPER_PICKAXE = create(key("copper_pickaxe"));
+
+    /**
+     * {@code minecraft:copper_shovel}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> COPPER_SHOVEL = create(key("copper_shovel"));
+
+    /**
+     * {@code minecraft:copper_sword}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> COPPER_SWORD = create(key("copper_sword"));
+
+    /**
+     * {@code minecraft:copper_torch}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> COPPER_TORCH = create(key("copper_torch"));
+
     /**
      * {@code minecraft:copper_trapdoor}
      *
@@ -2216,6 +2363,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> CRIMSON_ROOTS = create(key("crimson_roots"));
 
+    /**
+     * {@code minecraft:crimson_shelf}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> CRIMSON_SHELF = create(key("crimson_shelf"));
+
     /**
      * {@code minecraft:crimson_sign}
      *
@@ -2524,6 +2678,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> DARK_OAK_SAPLING = create(key("dark_oak_sapling"));
 
+    /**
+     * {@code minecraft:dark_oak_shelf}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> DARK_OAK_SHELF = create(key("dark_oak_shelf"));
+
     /**
      * {@code minecraft:dark_oak_sign}
      *
@@ -3273,6 +3434,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> EXPOSED_COPPER = create(key("exposed_copper"));
 
+    /**
+     * {@code minecraft:exposed_copper_bars}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> EXPOSED_COPPER_BARS = create(key("exposed_copper_bars"));
+
     /**
      * {@code minecraft:exposed_copper_bulb}
      *
@@ -3280,6 +3448,20 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> EXPOSED_COPPER_BULB = create(key("exposed_copper_bulb"));
 
+    /**
+     * {@code minecraft:exposed_copper_chain}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> EXPOSED_COPPER_CHAIN = create(key("exposed_copper_chain"));
+
+    /**
+     * {@code minecraft:exposed_copper_chest}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> EXPOSED_COPPER_CHEST = create(key("exposed_copper_chest"));
+
     /**
      * {@code minecraft:exposed_copper_door}
      *
@@ -3287,6 +3469,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> EXPOSED_COPPER_DOOR = create(key("exposed_copper_door"));
 
+    /**
+     * {@code minecraft:exposed_copper_golem_statue}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> EXPOSED_COPPER_GOLEM_STATUE = create(key("exposed_copper_golem_statue"));
+
     /**
      * {@code minecraft:exposed_copper_grate}
      *
@@ -3294,6 +3483,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> EXPOSED_COPPER_GRATE = create(key("exposed_copper_grate"));
 
+    /**
+     * {@code minecraft:exposed_copper_lantern}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> EXPOSED_COPPER_LANTERN = create(key("exposed_copper_lantern"));
+
     /**
      * {@code minecraft:exposed_copper_trapdoor}
      *
@@ -3322,6 +3518,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> EXPOSED_CUT_COPPER_STAIRS = create(key("exposed_cut_copper_stairs"));
 
+    /**
+     * {@code minecraft:exposed_lightning_rod}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> EXPOSED_LIGHTNING_ROD = create(key("exposed_lightning_rod"));
+
     /**
      * {@code minecraft:eye_armor_trim_smithing_template}
      *
@@ -4302,6 +4505,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> IRON_BOOTS = create(key("iron_boots"));
 
+    /**
+     * {@code minecraft:iron_chain}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> IRON_CHAIN = create(key("iron_chain"));
+
     /**
      * {@code minecraft:iron_chestplate}
      *
@@ -4512,6 +4722,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> JUNGLE_SAPLING = create(key("jungle_sapling"));
 
+    /**
+     * {@code minecraft:jungle_shelf}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> JUNGLE_SHELF = create(key("jungle_shelf"));
+
     /**
      * {@code minecraft:jungle_sign}
      *
@@ -5296,6 +5513,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> MANGROVE_ROOTS = create(key("mangrove_roots"));
 
+    /**
+     * {@code minecraft:mangrove_shelf}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> MANGROVE_SHELF = create(key("mangrove_shelf"));
+
     /**
      * {@code minecraft:mangrove_sign}
      *
@@ -5989,6 +6213,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> OAK_SAPLING = create(key("oak_sapling"));
 
+    /**
+     * {@code minecraft:oak_shelf}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> OAK_SHELF = create(key("oak_shelf"));
+
     /**
      * {@code minecraft:oak_sign}
      *
@@ -6206,6 +6437,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> OXIDIZED_COPPER = create(key("oxidized_copper"));
 
+    /**
+     * {@code minecraft:oxidized_copper_bars}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> OXIDIZED_COPPER_BARS = create(key("oxidized_copper_bars"));
+
     /**
      * {@code minecraft:oxidized_copper_bulb}
      *
@@ -6213,6 +6451,20 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> OXIDIZED_COPPER_BULB = create(key("oxidized_copper_bulb"));
 
+    /**
+     * {@code minecraft:oxidized_copper_chain}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> OXIDIZED_COPPER_CHAIN = create(key("oxidized_copper_chain"));
+
+    /**
+     * {@code minecraft:oxidized_copper_chest}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> OXIDIZED_COPPER_CHEST = create(key("oxidized_copper_chest"));
+
     /**
      * {@code minecraft:oxidized_copper_door}
      *
@@ -6220,6 +6472,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> OXIDIZED_COPPER_DOOR = create(key("oxidized_copper_door"));
 
+    /**
+     * {@code minecraft:oxidized_copper_golem_statue}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> OXIDIZED_COPPER_GOLEM_STATUE = create(key("oxidized_copper_golem_statue"));
+
     /**
      * {@code minecraft:oxidized_copper_grate}
      *
@@ -6227,6 +6486,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> OXIDIZED_COPPER_GRATE = create(key("oxidized_copper_grate"));
 
+    /**
+     * {@code minecraft:oxidized_copper_lantern}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> OXIDIZED_COPPER_LANTERN = create(key("oxidized_copper_lantern"));
+
     /**
      * {@code minecraft:oxidized_copper_trapdoor}
      *
@@ -6255,6 +6521,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> OXIDIZED_CUT_COPPER_STAIRS = create(key("oxidized_cut_copper_stairs"));
 
+    /**
+     * {@code minecraft:oxidized_lightning_rod}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> OXIDIZED_LIGHTNING_ROD = create(key("oxidized_lightning_rod"));
+
     /**
      * {@code minecraft:packed_ice}
      *
@@ -6381,6 +6654,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> PALE_OAK_SAPLING = create(key("pale_oak_sapling"));
 
+    /**
+     * {@code minecraft:pale_oak_shelf}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> PALE_OAK_SHELF = create(key("pale_oak_shelf"));
+
     /**
      * {@code minecraft:pale_oak_sign}
      *
@@ -8299,6 +8579,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> SPRUCE_SAPLING = create(key("spruce_sapling"));
 
+    /**
+     * {@code minecraft:spruce_shelf}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> SPRUCE_SHELF = create(key("spruce_shelf"));
+
     /**
      * {@code minecraft:spruce_sign}
      *
@@ -9160,6 +9447,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> WARPED_ROOTS = create(key("warped_roots"));
 
+    /**
+     * {@code minecraft:warped_shelf}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> WARPED_SHELF = create(key("warped_shelf"));
+
     /**
      * {@code minecraft:warped_sign}
      *
@@ -9216,6 +9510,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> WAXED_CHISELED_COPPER = create(key("waxed_chiseled_copper"));
 
+    /**
+     * {@code minecraft:waxed_copper_bars}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> WAXED_COPPER_BARS = create(key("waxed_copper_bars"));
+
     /**
      * {@code minecraft:waxed_copper_block}
      *
@@ -9230,6 +9531,20 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> WAXED_COPPER_BULB = create(key("waxed_copper_bulb"));
 
+    /**
+     * {@code minecraft:waxed_copper_chain}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> WAXED_COPPER_CHAIN = create(key("waxed_copper_chain"));
+
+    /**
+     * {@code minecraft:waxed_copper_chest}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> WAXED_COPPER_CHEST = create(key("waxed_copper_chest"));
+
     /**
      * {@code minecraft:waxed_copper_door}
      *
@@ -9237,6 +9552,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> WAXED_COPPER_DOOR = create(key("waxed_copper_door"));
 
+    /**
+     * {@code minecraft:waxed_copper_golem_statue}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> WAXED_COPPER_GOLEM_STATUE = create(key("waxed_copper_golem_statue"));
+
     /**
      * {@code minecraft:waxed_copper_grate}
      *
@@ -9244,6 +9566,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> WAXED_COPPER_GRATE = create(key("waxed_copper_grate"));
 
+    /**
+     * {@code minecraft:waxed_copper_lantern}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> WAXED_COPPER_LANTERN = create(key("waxed_copper_lantern"));
+
     /**
      * {@code minecraft:waxed_copper_trapdoor}
      *
@@ -9286,6 +9615,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> WAXED_EXPOSED_COPPER = create(key("waxed_exposed_copper"));
 
+    /**
+     * {@code minecraft:waxed_exposed_copper_bars}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> WAXED_EXPOSED_COPPER_BARS = create(key("waxed_exposed_copper_bars"));
+
     /**
      * {@code minecraft:waxed_exposed_copper_bulb}
      *
@@ -9293,6 +9629,20 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> WAXED_EXPOSED_COPPER_BULB = create(key("waxed_exposed_copper_bulb"));
 
+    /**
+     * {@code minecraft:waxed_exposed_copper_chain}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> WAXED_EXPOSED_COPPER_CHAIN = create(key("waxed_exposed_copper_chain"));
+
+    /**
+     * {@code minecraft:waxed_exposed_copper_chest}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> WAXED_EXPOSED_COPPER_CHEST = create(key("waxed_exposed_copper_chest"));
+
     /**
      * {@code minecraft:waxed_exposed_copper_door}
      *
@@ -9300,6 +9650,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> WAXED_EXPOSED_COPPER_DOOR = create(key("waxed_exposed_copper_door"));
 
+    /**
+     * {@code minecraft:waxed_exposed_copper_golem_statue}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> WAXED_EXPOSED_COPPER_GOLEM_STATUE = create(key("waxed_exposed_copper_golem_statue"));
+
     /**
      * {@code minecraft:waxed_exposed_copper_grate}
      *
@@ -9307,6 +9664,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> WAXED_EXPOSED_COPPER_GRATE = create(key("waxed_exposed_copper_grate"));
 
+    /**
+     * {@code minecraft:waxed_exposed_copper_lantern}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> WAXED_EXPOSED_COPPER_LANTERN = create(key("waxed_exposed_copper_lantern"));
+
     /**
      * {@code minecraft:waxed_exposed_copper_trapdoor}
      *
@@ -9335,6 +9699,20 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> WAXED_EXPOSED_CUT_COPPER_STAIRS = create(key("waxed_exposed_cut_copper_stairs"));
 
+    /**
+     * {@code minecraft:waxed_exposed_lightning_rod}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> WAXED_EXPOSED_LIGHTNING_ROD = create(key("waxed_exposed_lightning_rod"));
+
+    /**
+     * {@code minecraft:waxed_lightning_rod}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> WAXED_LIGHTNING_ROD = create(key("waxed_lightning_rod"));
+
     /**
      * {@code minecraft:waxed_oxidized_chiseled_copper}
      *
@@ -9349,6 +9727,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> WAXED_OXIDIZED_COPPER = create(key("waxed_oxidized_copper"));
 
+    /**
+     * {@code minecraft:waxed_oxidized_copper_bars}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> WAXED_OXIDIZED_COPPER_BARS = create(key("waxed_oxidized_copper_bars"));
+
     /**
      * {@code minecraft:waxed_oxidized_copper_bulb}
      *
@@ -9356,6 +9741,20 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> WAXED_OXIDIZED_COPPER_BULB = create(key("waxed_oxidized_copper_bulb"));
 
+    /**
+     * {@code minecraft:waxed_oxidized_copper_chain}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> WAXED_OXIDIZED_COPPER_CHAIN = create(key("waxed_oxidized_copper_chain"));
+
+    /**
+     * {@code minecraft:waxed_oxidized_copper_chest}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> WAXED_OXIDIZED_COPPER_CHEST = create(key("waxed_oxidized_copper_chest"));
+
     /**
      * {@code minecraft:waxed_oxidized_copper_door}
      *
@@ -9363,6 +9762,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> WAXED_OXIDIZED_COPPER_DOOR = create(key("waxed_oxidized_copper_door"));
 
+    /**
+     * {@code minecraft:waxed_oxidized_copper_golem_statue}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> WAXED_OXIDIZED_COPPER_GOLEM_STATUE = create(key("waxed_oxidized_copper_golem_statue"));
+
     /**
      * {@code minecraft:waxed_oxidized_copper_grate}
      *
@@ -9370,6 +9776,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> WAXED_OXIDIZED_COPPER_GRATE = create(key("waxed_oxidized_copper_grate"));
 
+    /**
+     * {@code minecraft:waxed_oxidized_copper_lantern}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> WAXED_OXIDIZED_COPPER_LANTERN = create(key("waxed_oxidized_copper_lantern"));
+
     /**
      * {@code minecraft:waxed_oxidized_copper_trapdoor}
      *
@@ -9398,6 +9811,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> WAXED_OXIDIZED_CUT_COPPER_STAIRS = create(key("waxed_oxidized_cut_copper_stairs"));
 
+    /**
+     * {@code minecraft:waxed_oxidized_lightning_rod}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> WAXED_OXIDIZED_LIGHTNING_ROD = create(key("waxed_oxidized_lightning_rod"));
+
     /**
      * {@code minecraft:waxed_weathered_chiseled_copper}
      *
@@ -9412,6 +9832,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> WAXED_WEATHERED_COPPER = create(key("waxed_weathered_copper"));
 
+    /**
+     * {@code minecraft:waxed_weathered_copper_bars}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> WAXED_WEATHERED_COPPER_BARS = create(key("waxed_weathered_copper_bars"));
+
     /**
      * {@code minecraft:waxed_weathered_copper_bulb}
      *
@@ -9419,6 +9846,20 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> WAXED_WEATHERED_COPPER_BULB = create(key("waxed_weathered_copper_bulb"));
 
+    /**
+     * {@code minecraft:waxed_weathered_copper_chain}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> WAXED_WEATHERED_COPPER_CHAIN = create(key("waxed_weathered_copper_chain"));
+
+    /**
+     * {@code minecraft:waxed_weathered_copper_chest}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> WAXED_WEATHERED_COPPER_CHEST = create(key("waxed_weathered_copper_chest"));
+
     /**
      * {@code minecraft:waxed_weathered_copper_door}
      *
@@ -9426,6 +9867,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> WAXED_WEATHERED_COPPER_DOOR = create(key("waxed_weathered_copper_door"));
 
+    /**
+     * {@code minecraft:waxed_weathered_copper_golem_statue}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> WAXED_WEATHERED_COPPER_GOLEM_STATUE = create(key("waxed_weathered_copper_golem_statue"));
+
     /**
      * {@code minecraft:waxed_weathered_copper_grate}
      *
@@ -9433,6 +9881,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> WAXED_WEATHERED_COPPER_GRATE = create(key("waxed_weathered_copper_grate"));
 
+    /**
+     * {@code minecraft:waxed_weathered_copper_lantern}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> WAXED_WEATHERED_COPPER_LANTERN = create(key("waxed_weathered_copper_lantern"));
+
     /**
      * {@code minecraft:waxed_weathered_copper_trapdoor}
      *
@@ -9461,6 +9916,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> WAXED_WEATHERED_CUT_COPPER_STAIRS = create(key("waxed_weathered_cut_copper_stairs"));
 
+    /**
+     * {@code minecraft:waxed_weathered_lightning_rod}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> WAXED_WEATHERED_LIGHTNING_ROD = create(key("waxed_weathered_lightning_rod"));
+
     /**
      * {@code minecraft:wayfinder_armor_trim_smithing_template}
      *
@@ -9482,6 +9944,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> WEATHERED_COPPER = create(key("weathered_copper"));
 
+    /**
+     * {@code minecraft:weathered_copper_bars}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> WEATHERED_COPPER_BARS = create(key("weathered_copper_bars"));
+
     /**
      * {@code minecraft:weathered_copper_bulb}
      *
@@ -9489,6 +9958,20 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> WEATHERED_COPPER_BULB = create(key("weathered_copper_bulb"));
 
+    /**
+     * {@code minecraft:weathered_copper_chain}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> WEATHERED_COPPER_CHAIN = create(key("weathered_copper_chain"));
+
+    /**
+     * {@code minecraft:weathered_copper_chest}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> WEATHERED_COPPER_CHEST = create(key("weathered_copper_chest"));
+
     /**
      * {@code minecraft:weathered_copper_door}
      *
@@ -9496,6 +9979,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> WEATHERED_COPPER_DOOR = create(key("weathered_copper_door"));
 
+    /**
+     * {@code minecraft:weathered_copper_golem_statue}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> WEATHERED_COPPER_GOLEM_STATUE = create(key("weathered_copper_golem_statue"));
+
     /**
      * {@code minecraft:weathered_copper_grate}
      *
@@ -9503,6 +9993,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> WEATHERED_COPPER_GRATE = create(key("weathered_copper_grate"));
 
+    /**
+     * {@code minecraft:weathered_copper_lantern}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> WEATHERED_COPPER_LANTERN = create(key("weathered_copper_lantern"));
+
     /**
      * {@code minecraft:weathered_copper_trapdoor}
      *
@@ -9531,6 +10028,13 @@ public final class ItemTypeKeys {
      */
     public static final TypedKey<ItemType> WEATHERED_CUT_COPPER_STAIRS = create(key("weathered_cut_copper_stairs"));
 
+    /**
+     * {@code minecraft:weathered_lightning_rod}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<ItemType> WEATHERED_LIGHTNING_ROD = create(key("weathered_lightning_rod"));
+
     /**
      * {@code minecraft:weeping_vines}
      *

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -2,7 +2,7 @@ package io.papermc.paper.registry.keys;
 
 import static net.kyori.adventure.key.Key.key;
 
-import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import net.kyori.adventure.key.Key;
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.8")
+@GeneratedClass
 public final class SoundEventKeys {
     /**
      * {@code minecraft:ambient.basalt_deltas.additions}
@@ -1565,6 +1565,48 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> BLOCK_COPPER_BULB_TURN_ON = create(key("block.copper_bulb.turn_on"));
 
+    /**
+     * {@code minecraft:block.copper_chest.close}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_COPPER_CHEST_CLOSE = create(key("block.copper_chest.close"));
+
+    /**
+     * {@code minecraft:block.copper_chest.open}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_COPPER_CHEST_OPEN = create(key("block.copper_chest.open"));
+
+    /**
+     * {@code minecraft:block.copper_chest_oxidized.close}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_COPPER_CHEST_OXIDIZED_CLOSE = create(key("block.copper_chest_oxidized.close"));
+
+    /**
+     * {@code minecraft:block.copper_chest_oxidized.open}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_COPPER_CHEST_OXIDIZED_OPEN = create(key("block.copper_chest_oxidized.open"));
+
+    /**
+     * {@code minecraft:block.copper_chest_weathered.close}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_COPPER_CHEST_WEATHERED_CLOSE = create(key("block.copper_chest_weathered.close"));
+
+    /**
+     * {@code minecraft:block.copper_chest_weathered.open}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_COPPER_CHEST_WEATHERED_OPEN = create(key("block.copper_chest_weathered.open"));
+
     /**
      * {@code minecraft:block.copper_door.close}
      *
@@ -1579,6 +1621,41 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> BLOCK_COPPER_DOOR_OPEN = create(key("block.copper_door.open"));
 
+    /**
+     * {@code minecraft:block.copper_golem_statue.break}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_COPPER_GOLEM_STATUE_BREAK = create(key("block.copper_golem_statue.break"));
+
+    /**
+     * {@code minecraft:block.copper_golem_statue.fall}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_COPPER_GOLEM_STATUE_FALL = create(key("block.copper_golem_statue.fall"));
+
+    /**
+     * {@code minecraft:block.copper_golem_statue.hit}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_COPPER_GOLEM_STATUE_HIT = create(key("block.copper_golem_statue.hit"));
+
+    /**
+     * {@code minecraft:block.copper_golem_statue.place}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_COPPER_GOLEM_STATUE_PLACE = create(key("block.copper_golem_statue.place"));
+
+    /**
+     * {@code minecraft:block.copper_golem_statue.step}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_COPPER_GOLEM_STATUE_STEP = create(key("block.copper_golem_statue.step"));
+
     /**
      * {@code minecraft:block.copper_grate.break}
      *
@@ -4428,6 +4505,83 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> BLOCK_SCULK_VEIN_STEP = create(key("block.sculk_vein.step"));
 
+    /**
+     * {@code minecraft:block.shelf.activate}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_SHELF_ACTIVATE = create(key("block.shelf.activate"));
+
+    /**
+     * {@code minecraft:block.shelf.break}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_SHELF_BREAK = create(key("block.shelf.break"));
+
+    /**
+     * {@code minecraft:block.shelf.deactivate}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_SHELF_DEACTIVATE = create(key("block.shelf.deactivate"));
+
+    /**
+     * {@code minecraft:block.shelf.fall}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_SHELF_FALL = create(key("block.shelf.fall"));
+
+    /**
+     * {@code minecraft:block.shelf.hit}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_SHELF_HIT = create(key("block.shelf.hit"));
+
+    /**
+     * {@code minecraft:block.shelf.multi_swap}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_SHELF_MULTI_SWAP = create(key("block.shelf.multi_swap"));
+
+    /**
+     * {@code minecraft:block.shelf.place}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_SHELF_PLACE = create(key("block.shelf.place"));
+
+    /**
+     * {@code minecraft:block.shelf.place_item}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_SHELF_PLACE_ITEM = create(key("block.shelf.place_item"));
+
+    /**
+     * {@code minecraft:block.shelf.single_swap}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_SHELF_SINGLE_SWAP = create(key("block.shelf.single_swap"));
+
+    /**
+     * {@code minecraft:block.shelf.step}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_SHELF_STEP = create(key("block.shelf.step"));
+
+    /**
+     * {@code minecraft:block.shelf.take_item}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> BLOCK_SHELF_TAKE_ITEM = create(key("block.shelf.take_item"));
+
     /**
      * {@code minecraft:block.shroomlight.break}
      *
@@ -6332,6 +6486,139 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> ENTITY_COD_HURT = create(key("entity.cod.hurt"));
 
+    /**
+     * {@code minecraft:entity.copper_golem.death}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_COPPER_GOLEM_DEATH = create(key("entity.copper_golem.death"));
+
+    /**
+     * {@code minecraft:entity.copper_golem.hurt}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_COPPER_GOLEM_HURT = create(key("entity.copper_golem.hurt"));
+
+    /**
+     * {@code minecraft:entity.copper_golem.item_drop}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_COPPER_GOLEM_ITEM_DROP = create(key("entity.copper_golem.item_drop"));
+
+    /**
+     * {@code minecraft:entity.copper_golem.item_no_drop}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_COPPER_GOLEM_ITEM_NO_DROP = create(key("entity.copper_golem.item_no_drop"));
+
+    /**
+     * {@code minecraft:entity.copper_golem.no_item_get}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_COPPER_GOLEM_NO_ITEM_GET = create(key("entity.copper_golem.no_item_get"));
+
+    /**
+     * {@code minecraft:entity.copper_golem.no_item_no_get}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_COPPER_GOLEM_NO_ITEM_NO_GET = create(key("entity.copper_golem.no_item_no_get"));
+
+    /**
+     * {@code minecraft:entity.copper_golem.shear}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_COPPER_GOLEM_SHEAR = create(key("entity.copper_golem.shear"));
+
+    /**
+     * {@code minecraft:entity.copper_golem.spawn}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_COPPER_GOLEM_SPAWN = create(key("entity.copper_golem.spawn"));
+
+    /**
+     * {@code minecraft:entity.copper_golem.spin}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_COPPER_GOLEM_SPIN = create(key("entity.copper_golem.spin"));
+
+    /**
+     * {@code minecraft:entity.copper_golem.step}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_COPPER_GOLEM_STEP = create(key("entity.copper_golem.step"));
+
+    /**
+     * {@code minecraft:entity.copper_golem_become_statue}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_COPPER_GOLEM_BECOME_STATUE = create(key("entity.copper_golem_become_statue"));
+
+    /**
+     * {@code minecraft:entity.copper_golem_oxidized.death}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_COPPER_GOLEM_OXIDIZED_DEATH = create(key("entity.copper_golem_oxidized.death"));
+
+    /**
+     * {@code minecraft:entity.copper_golem_oxidized.hurt}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_COPPER_GOLEM_OXIDIZED_HURT = create(key("entity.copper_golem_oxidized.hurt"));
+
+    /**
+     * {@code minecraft:entity.copper_golem_oxidized.spin}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_COPPER_GOLEM_OXIDIZED_SPIN = create(key("entity.copper_golem_oxidized.spin"));
+
+    /**
+     * {@code minecraft:entity.copper_golem_oxidized.step}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_COPPER_GOLEM_OXIDIZED_STEP = create(key("entity.copper_golem_oxidized.step"));
+
+    /**
+     * {@code minecraft:entity.copper_golem_weathered.death}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_COPPER_GOLEM_WEATHERED_DEATH = create(key("entity.copper_golem_weathered.death"));
+
+    /**
+     * {@code minecraft:entity.copper_golem_weathered.hurt}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_COPPER_GOLEM_WEATHERED_HURT = create(key("entity.copper_golem_weathered.hurt"));
+
+    /**
+     * {@code minecraft:entity.copper_golem_weathered.spin}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_COPPER_GOLEM_WEATHERED_SPIN = create(key("entity.copper_golem_weathered.spin"));
+
+    /**
+     * {@code minecraft:entity.copper_golem_weathered.step}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ENTITY_COPPER_GOLEM_WEATHERED_STEP = create(key("entity.copper_golem_weathered.step"));
+
     /**
      * {@code minecraft:entity.cow.ambient}
      *
@@ -10980,6 +11267,13 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> ITEM_ARMOR_EQUIP_CHAIN = create(key("item.armor.equip_chain"));
 
+    /**
+     * {@code minecraft:item.armor.equip_copper}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> ITEM_ARMOR_EQUIP_COPPER = create(key("item.armor.equip_copper"));
+
     /**
      * {@code minecraft:item.armor.equip_diamond}
      *
@@ -12107,6 +12401,13 @@ public final class SoundEventKeys {
      */
     public static final TypedKey<Sound> UI_TOAST_OUT = create(key("ui.toast.out"));
 
+    /**
+     * {@code minecraft:weather.end_flash}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TypedKey<Sound> WEATHER_END_FLASH = create(key("weather.end_flash"));
+
     /**
      * {@code minecraft:weather.rain}
      *

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -2,7 +2,7 @@ package io.papermc.paper.registry.keys.tags;
 
 import static net.kyori.adventure.key.Key.key;
 
-import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.tag.TagKey;
 import net.kyori.adventure.key.Key;
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.8")
+@GeneratedClass
 public final class BlockTypeTagKeys {
     /**
      * {@code #minecraft:acacia_logs}
@@ -130,6 +130,13 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> BANNERS = create(key("banners"));
 
+    /**
+     * {@code #minecraft:bars}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> BARS = create(key("bars"));
+
     /**
      * {@code #minecraft:base_stone_nether}
      *
@@ -270,6 +277,13 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> CEILING_HANGING_SIGNS = create(key("ceiling_hanging_signs"));
 
+    /**
+     * {@code #minecraft:chains}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> CHAINS = create(key("chains"));
+
     /**
      * {@code #minecraft:cherry_logs}
      *
@@ -319,6 +333,27 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> CONVERTABLE_TO_MUD = create(key("convertable_to_mud"));
 
+    /**
+     * {@code #minecraft:copper}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> COPPER = create(key("copper"));
+
+    /**
+     * {@code #minecraft:copper_chests}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> COPPER_CHESTS = create(key("copper_chests"));
+
+    /**
+     * {@code #minecraft:copper_golem_statues}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> COPPER_GOLEM_STATUES = create(key("copper_golem_statues"));
+
     /**
      * {@code #minecraft:copper_ores}
      *
@@ -606,6 +641,13 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> IMPERMEABLE = create(key("impermeable"));
 
+    /**
+     * {@code #minecraft:incorrect_for_copper_tool}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> INCORRECT_FOR_COPPER_TOOL = create(key("incorrect_for_copper_tool"));
+
     /**
      * {@code #minecraft:incorrect_for_diamond_tool}
      *
@@ -697,6 +739,13 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> JUNGLE_LOGS = create(key("jungle_logs"));
 
+    /**
+     * {@code #minecraft:lanterns}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> LANTERNS = create(key("lanterns"));
+
     /**
      * {@code #minecraft:lapis_ores}
      *
@@ -718,6 +767,13 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> LEAVES = create(key("leaves"));
 
+    /**
+     * {@code #minecraft:lightning_rods}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> LIGHTNING_RODS = create(key("lightning_rods"));
+
     /**
      * {@code #minecraft:logs}
      *
@@ -1348,6 +1404,13 @@ public final class BlockTypeTagKeys {
      */
     public static final TagKey<BlockType> WOODEN_PRESSURE_PLATES = create(key("wooden_pressure_plates"));
 
+    /**
+     * {@code #minecraft:wooden_shelves}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<BlockType> WOODEN_SHELVES = create(key("wooden_shelves"));
+
     /**
      * {@code #minecraft:wooden_slabs}
      *

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

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

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

@@ -2,8 +2,8 @@ package io.papermc.paper.registry.keys.tags;
 
 import static net.kyori.adventure.key.Key.key;
 
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.dialog.Dialog;
-import io.papermc.paper.generated.GeneratedFrom;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.tag.TagKey;
 import net.kyori.adventure.key.Key;
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.8")
+@GeneratedClass
 public final class DialogTagKeys {
     /**
      * {@code #minecraft:pause_screen_additions}

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

@@ -2,7 +2,7 @@ package io.papermc.paper.registry.keys.tags;
 
 import static net.kyori.adventure.key.Key.key;
 
-import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.tag.TagKey;
 import net.kyori.adventure.key.Key;
@@ -25,7 +25,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.8")
+@GeneratedClass
 public final class EnchantmentTagKeys {
     /**
      * {@code #minecraft:curse}

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

@@ -2,7 +2,7 @@ package io.papermc.paper.registry.keys.tags;
 
 import static net.kyori.adventure.key.Key.key;
 
-import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.tag.TagKey;
 import net.kyori.adventure.key.Key;
@@ -23,8 +23,15 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.8")
+@GeneratedClass
 public final class EntityTypeTagKeys {
+    /**
+     * {@code #minecraft:accepts_iron_golem_gift}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<EntityType> ACCEPTS_IRON_GOLEM_GIFT = create(key("accepts_iron_golem_gift"));
+
     /**
      * {@code #minecraft:aquatic}
      *
@@ -109,6 +116,20 @@ public final class EntityTypeTagKeys {
      */
     public static final TagKey<EntityType> CAN_WEAR_HORSE_ARMOR = create(key("can_wear_horse_armor"));
 
+    /**
+     * {@code #minecraft:candidate_for_iron_golem_gift}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<EntityType> CANDIDATE_FOR_IRON_GOLEM_GIFT = create(key("candidate_for_iron_golem_gift"));
+
+    /**
+     * {@code #minecraft:cannot_be_pushed_onto_boats}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<EntityType> CANNOT_BE_PUSHED_ONTO_BOATS = create(key("cannot_be_pushed_onto_boats"));
+
     /**
      * {@code #minecraft:deflects_projectiles}
      *

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

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

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

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

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

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

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

@@ -2,7 +2,7 @@ package io.papermc.paper.registry.keys.tags;
 
 import static net.kyori.adventure.key.Key.key;
 
-import io.papermc.paper.generated.GeneratedFrom;
+import io.papermc.paper.annotation.GeneratedClass;
 import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.tag.TagKey;
 import net.kyori.adventure.key.Key;
@@ -23,7 +23,7 @@ import org.jspecify.annotations.NullMarked;
         "SpellCheckingInspection"
 })
 @NullMarked
-@GeneratedFrom("1.21.8")
+@GeneratedClass
 public final class ItemTypeTagKeys {
     /**
      * {@code #minecraft:acacia_logs}
@@ -81,6 +81,13 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> BANNERS = create(key("banners"));
 
+    /**
+     * {@code #minecraft:bars}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> BARS = create(key("bars"));
+
     /**
      * {@code #minecraft:beacon_payment_items}
      *
@@ -179,6 +186,13 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> CAT_FOOD = create(key("cat_food"));
 
+    /**
+     * {@code #minecraft:chains}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> CHAINS = create(key("chains"));
+
     /**
      * {@code #minecraft:cherry_logs}
      *
@@ -242,6 +256,27 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> COMPLETES_FIND_TREE_TUTORIAL = create(key("completes_find_tree_tutorial"));
 
+    /**
+     * {@code #minecraft:copper}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> COPPER = create(key("copper"));
+
+    /**
+     * {@code #minecraft:copper_chests}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> COPPER_CHESTS = create(key("copper_chests"));
+
+    /**
+     * {@code #minecraft:copper_golem_statues}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> COPPER_GOLEM_STATUES = create(key("copper_golem_statues"));
+
     /**
      * {@code #minecraft:copper_ores}
      *
@@ -249,6 +284,13 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> COPPER_ORES = create(key("copper_ores"));
 
+    /**
+     * {@code #minecraft:copper_tool_materials}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> COPPER_TOOL_MATERIALS = create(key("copper_tool_materials"));
+
     /**
      * {@code #minecraft:cow_food}
      *
@@ -683,6 +725,13 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> JUNGLE_LOGS = create(key("jungle_logs"));
 
+    /**
+     * {@code #minecraft:lanterns}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> LANTERNS = create(key("lanterns"));
+
     /**
      * {@code #minecraft:lapis_ores}
      *
@@ -711,6 +760,13 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> LEG_ARMOR = create(key("leg_armor"));
 
+    /**
+     * {@code #minecraft:lightning_rods}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> LIGHTNING_RODS = create(key("lightning_rods"));
+
     /**
      * {@code #minecraft:llama_food}
      *
@@ -921,6 +977,13 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> REPAIRS_CHAIN_ARMOR = create(key("repairs_chain_armor"));
 
+    /**
+     * {@code #minecraft:repairs_copper_armor}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> REPAIRS_COPPER_ARMOR = create(key("repairs_copper_armor"));
+
     /**
      * {@code #minecraft:repairs_diamond_armor}
      *
@@ -984,6 +1047,13 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> SAPLINGS = create(key("saplings"));
 
+    /**
+     * {@code #minecraft:shearable_from_copper_golem}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> SHEARABLE_FROM_COPPER_GOLEM = create(key("shearable_from_copper_golem"));
+
     /**
      * {@code #minecraft:sheep_food}
      *
@@ -1236,6 +1306,13 @@ public final class ItemTypeTagKeys {
      */
     public static final TagKey<ItemType> WOODEN_PRESSURE_PLATES = create(key("wooden_pressure_plates"));
 
+    /**
+     * {@code #minecraft:wooden_shelves}
+     *
+     * @apiNote This field is version-dependant and may be removed in future Minecraft versions
+     */
+    public static final TagKey<ItemType> WOODEN_SHELVES = create(key("wooden_shelves"));
+
     /**
      * {@code #minecraft:wooden_slabs}
      *

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

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

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

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

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

@@ -51,8 +51,7 @@ import static co.aikar.timings.TimingsManager.MINUTE_REPORTS;
 import static co.aikar.util.JSONUtil.*;
 
 /**
- * Internal.
- *
+ * @hidden
  * @deprecated Timings will be removed in the future
  */
 @Deprecated(forRemoval = true)

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

@@ -82,9 +82,9 @@ public class LoadingMap <K, V> extends AbstractMap<K, V> {
     /**
      * Creates a LoadingMap with an auto instantiating loader.
      *
-     * Will auto construct class of of Value when not found
+     * Will auto construct class of Value when not found
      *
-     * Since this uses Reflection, It is more effecient to define your own static loader
+     * Since this uses Reflection, It is more efficient to define your own static loader
      * than using this helper, but if performance is not critical, this is easier.
      *
      * @param backingMap Actual map being used.
@@ -102,9 +102,9 @@ public class LoadingMap <K, V> extends AbstractMap<K, V> {
     /**
      * Creates a LoadingMap with an auto instantiating loader.
      *
-     * Will auto construct class of of Value when not found
+     * Will auto construct class of Value when not found
      *
-     * Since this uses Reflection, It is more effecient to define your own static loader
+     * Since this uses Reflection, It is more efficient to define your own static loader
      * than using this helper, but if performance is not critical, this is easier.
      *
      * @param backingMap Actual map being used.

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

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

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

@@ -202,7 +202,7 @@ public class MaterialTags {
      */
     public static final MaterialSetTag HORSE_ARMORS = new MaterialSetTag(keyFor("horse_armors"))
         .endsWith("_HORSE_ARMOR")
-        .ensureSize("HORSE_ARMORS", 4).lock();
+        .ensureSize("HORSE_ARMORS", 5).lock();
 
     /**
      * Covers the variants of infested blocks.
@@ -340,7 +340,7 @@ public class MaterialTags {
      */
     public static final MaterialSetTag SPAWN_EGGS = new MaterialSetTag(keyFor("spawn_eggs"))
         .endsWith("_SPAWN_EGG")
-        .ensureSize("SPAWN_EGGS", 82).lock();
+        .ensureSize("SPAWN_EGGS", 83).lock();
 
     /**
      * Covers all colors of stained glass.
@@ -432,19 +432,27 @@ public class MaterialTags {
         .add(Material.SOUL_TORCH, Material.SOUL_WALL_TORCH)
         .ensureSize("SOUL_TORCH", 2).lock();
 
+    /**
+     * Covers the variants of a copper torch.
+     */
+    public static final MaterialSetTag COPPER_TORCH = new MaterialSetTag(keyFor("copper_torch"))
+        .add(Material.COPPER_TORCH, Material.COPPER_WALL_TORCH)
+        .ensureSize("COPPER_TORCH", 2).lock();
+
     /**
      * Covers the variants of torches.
      */
     public static final MaterialSetTag TORCHES = new MaterialSetTag(keyFor("torches"))
-        .add(TORCH, REDSTONE_TORCH, SOUL_TORCH)
-        .ensureSize("TORCHES", 6).lock();
+        .add(TORCH, REDSTONE_TORCH, SOUL_TORCH, COPPER_TORCH)
+        .ensureSize("TORCHES", 8).lock();
 
     /**
      * Covers the variants of lanterns.
+     *
+     * @deprecated in favour of {@link Tag#LANTERNS}
      */
-    public static final MaterialSetTag LANTERNS = new MaterialSetTag(keyFor("lanterns"))
-        .add(Material.LANTERN, Material.SOUL_LANTERN)
-        .ensureSize("LANTERNS", 2).lock();
+    @Deprecated(since = "1.21.9")
+    public static final MaterialSetTag LANTERNS = replacedBy(Tag.LANTERNS);
 
     /**
      * Covers the variants of rails.
@@ -644,19 +652,19 @@ public class MaterialTags {
      * Covers all oxidized copper blocks.
      */
     public static final MaterialSetTag OXIDIZED_COPPER_BLOCKS = new MaterialSetTag(keyFor("oxidized_copper_blocks"))
-        .startsWith("OXIDIZED_").startsWith("WAXED_OXIDIZED_").ensureSize("OXIDIZED_COPPER_BLOCKS", 18).lock();
+        .startsWith("OXIDIZED_").startsWith("WAXED_OXIDIZED_").ensureSize("OXIDIZED_COPPER_BLOCKS", 30).lock();
 
     /**
      * Covers all weathered copper blocks.
      */
     public static final MaterialSetTag WEATHERED_COPPER_BLOCKS = new MaterialSetTag(keyFor("weathered_copper_blocks"))
-        .startsWith("WEATHERED_").startsWith("WAXED_WEATHERED_").ensureSize("WEATHERED_COPPER_BLOCKS", 18).lock();
+        .startsWith("WEATHERED_").startsWith("WAXED_WEATHERED_").ensureSize("WEATHERED_COPPER_BLOCKS", 30).lock();
 
     /**
      * Covers all exposed copper blocks.
      */
     public static final MaterialSetTag EXPOSED_COPPER_BLOCKS = new MaterialSetTag(keyFor("exposed_copper_blocks"))
-        .startsWith("EXPOSED_").startsWith("WAXED_EXPOSED_").ensureSize("EXPOSED_COPPER_BLOCKS", 18).lock();
+        .startsWith("EXPOSED_").startsWith("WAXED_EXPOSED_").ensureSize("EXPOSED_COPPER_BLOCKS", 30).lock();
 
     /**
      * Covers all un-weathered copper blocks.
@@ -665,8 +673,11 @@ public class MaterialTags {
         .startsWith("CUT_COPPER").startsWith("WAXED_CUT_COPPER")
         .startsWith("WAXED_COPPER_").startsWith("COPPER_")
         .add(Material.CHISELED_COPPER, Material.WAXED_CHISELED_COPPER)
-        .not(Material.COPPER_INGOT, Material.COPPER_ORE)
-        .ensureSize("UNAFFECTED_COPPER_BLOCKS", 18).lock();
+        .not(Material.COPPER_INGOT, Material.COPPER_ORE, Material.COPPER_NUGGET)
+        .not(Material.COPPER_HORSE_ARMOR, Material.COPPER_GOLEM_SPAWN_EGG)
+        .not(Material.COPPER_HELMET, Material.COPPER_CHESTPLATE, Material.COPPER_LEGGINGS, Material.COPPER_BOOTS)
+        .not(Material.COPPER_AXE, Material.COPPER_HOE, Material.COPPER_PICKAXE, Material.COPPER_SHOVEL, Material.COPPER_SWORD)
+        .ensureSize("UNAFFECTED_COPPER_BLOCKS", 30).lock();
 
     /**
      * Covers all waxed copper blocks.
@@ -674,7 +685,7 @@ public class MaterialTags {
      * Combine with other copper-related tags to filter is-waxed or not.
      */
     public static final MaterialSetTag WAXED_COPPER_BLOCKS = new MaterialSetTag(keyFor("waxed_copper_blocks"))
-        .add(m -> m.name().startsWith("WAXED_") && m.name().contains("COPPER")).ensureSize("WAXED_COPPER_BLOCKS", 36).lock();
+        .add(m -> m.name().startsWith("WAXED_") && m.name().contains("COPPER")).ensureSize("WAXED_COPPER_BLOCKS", 56).lock();
 
     /**
      * Covers all un-waxed copper blocks.
@@ -685,13 +696,14 @@ public class MaterialTags {
         .startsWith("EXPOSED_").startsWith("WEATHERED_").startsWith("OXIDIZED_")
         .startsWith("CUT_COPPER")
         .add(Material.COPPER_BLOCK, Material.CHISELED_COPPER, Material.COPPER_DOOR, Material.COPPER_TRAPDOOR, Material.COPPER_GRATE, Material.COPPER_BULB)
-        .ensureSize("UNWAXED_COPPER_BLOCKS", 36).lock();
+        .add(Material.COPPER_BARS, Material.COPPER_TORCH, Material.COPPER_CHEST, Material.COPPER_CHAIN, Material.COPPER_WALL_TORCH, Material.COPPER_LANTERN, Material.COPPER_GOLEM_STATUE)
+        .ensureSize("UNWAXED_COPPER_BLOCKS", 61).lock();
 
     /**
      * Covers all copper block variants.
      */
     public static final MaterialSetTag COPPER_BLOCKS = new MaterialSetTag(keyFor("copper_blocks"))
-        .add(WAXED_COPPER_BLOCKS).add(UNWAXED_COPPER_BLOCKS).ensureSize("COPPER_BLOCKS", 72).lock();
+        .add(WAXED_COPPER_BLOCKS).add(UNWAXED_COPPER_BLOCKS).ensureSize("COPPER_BLOCKS", 117).lock();
 
     /**
      * Covers all weathering/waxed states of the plain copper block.
@@ -736,6 +748,13 @@ public class MaterialTags {
         .add(Material.STONE_AXE, Material.STONE_HOE, Material.STONE_PICKAXE, Material.STONE_SHOVEL, Material.STONE_SWORD)
         .ensureSize("STONE_TOOLS", 5).lock();
 
+    /**
+     * Covers all copper Tools.
+     */
+    public static final MaterialSetTag COPPER_TOOLS = new MaterialSetTag(keyFor("copper_tools"))
+        .add(Material.COPPER_AXE, Material.COPPER_HOE, Material.COPPER_PICKAXE, Material.COPPER_SHOVEL, Material.COPPER_SWORD)
+        .ensureSize("COPPER_TOOLS", 5).lock();
+
     /**
      * Covers all Iron Tools.
      */

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

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

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

@@ -162,7 +162,7 @@ public final class Title {
     /**
      * Creates a new title.
      *
-     * <p>It is recommended to the {@link BaseComponent} constrctors.</p>
+     * <p>It is recommended to use the {@link BaseComponent} constructors.</p>
      *
      * @param title    the main text of the title
      * @param subtitle the secondary text of the title
@@ -234,7 +234,7 @@ public final class Title {
     }
 
     /**
-     * Sends the title directly to an player
+     * Sends the title directly to a player
      *
      * @param player the receiver of the title
      */
@@ -315,7 +315,7 @@ public final class Title {
         /**
          * Sets the title to the given text.
          *
-         * <p>It is recommended to the {@link BaseComponent} methods.</p>
+         * <p>It is recommended to use the {@link BaseComponent} methods.</p>
          *
          * @param title the title text
          * @return this builder instance
@@ -352,7 +352,7 @@ public final class Title {
         /**
          * Sets the subtitle to the given text.
          *
-         * <p>It is recommended to the {@link BaseComponent} methods.</p>
+         * <p>It is recommended to use the {@link BaseComponent} methods.</p>
          *
          * @param subtitle the title text
          * @return this builder instance

paper-api/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java

@@ -52,7 +52,7 @@ public interface Pathfinder {
      * The behavior of this PathResult is subject to the games pathfinding rules, and may
      * result in the pathfinding automatically updating to follow the target Entity.
      * <p>
-     * However, this behavior is not guaranteed, and is subject to the games behavior.
+     * However, this behavior is not guaranteed, and is subject to the game's behavior.
      *
      * @param target the Entity to navigate to
      * @return The closest Location the Entity can get to for this navigation, or null if no path could be calculated
@@ -90,7 +90,7 @@ public interface Pathfinder {
      * The behavior of this PathResult is subject to the games pathfinding rules, and may
      * result in the pathfinding automatically updating to follow the target Entity.
      * <p>
-     * However, this behavior is not guaranteed, and is subject to the games behavior.
+     * However, this behavior is not guaranteed, and is subject to the game's behavior.
      *
      * @param target the Entity to navigate to
      * @return If the pathfinding was successfully started
@@ -106,7 +106,7 @@ public interface Pathfinder {
      * The behavior of this PathResult is subject to the games pathfinding rules, and may
      * result in the pathfinding automatically updating to follow the target Entity.
      * <p>
-     * However, this behavior is not guaranteed, and is subject to the games behavior.
+     * However, this behavior is not guaranteed, and is subject to the game's behavior.
      *
      * @param target the Entity to navigate to
      * @param speed  Speed multiplier to navigate at, where 1 is 'normal'

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

@@ -1,6 +1,5 @@
 package com.destroystokyo.paper.entity.ai;
 
-
 import java.util.Collection;
 import org.bukkit.entity.Mob;
 import org.jspecify.annotations.NullMarked;

paper-api/src/main/java/com/destroystokyo/paper/event/brigadier/AsyncPlayerSendCommandsEvent.java

@@ -34,6 +34,7 @@ import org.jspecify.annotations.NullMarked;
 public class AsyncPlayerSendCommandsEvent<S extends CommandSourceStack> extends PlayerEvent {
 
     private static final HandlerList HANDLER_LIST = new HandlerList();
+
     private final RootCommandNode<S> node;
     private final boolean hasFiredAsync;
 

paper-api/src/main/java/com/destroystokyo/paper/event/brigadier/AsyncPlayerSendSuggestionsEvent.java

@@ -18,11 +18,12 @@ import org.jspecify.annotations.NullMarked;
 public class AsyncPlayerSendSuggestionsEvent extends PlayerEvent implements Cancellable {
 
     private static final HandlerList HANDLER_LIST = new HandlerList();
-    private boolean cancelled = false;
 
     private Suggestions suggestions;
     private final String buffer;
 
+    private boolean cancelled;
+
     @ApiStatus.Internal
     public AsyncPlayerSendSuggestionsEvent(final Player player, final Suggestions suggestions, final String buffer) {
         super(player, !Bukkit.isPrimaryThread());
@@ -57,9 +58,6 @@ public class AsyncPlayerSendSuggestionsEvent extends PlayerEvent implements Canc
         this.suggestions = suggestions;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public boolean isCancelled() {
         return this.cancelled;
@@ -67,6 +65,7 @@ public class AsyncPlayerSendSuggestionsEvent extends PlayerEvent implements Canc
 
     /**
      * Cancels sending suggestions to the client.
+     * <p>
      * {@inheritDoc}
      */
     @Override

paper-api/src/main/java/com/destroystokyo/paper/event/brigadier/CommandRegisteredEvent.java

@@ -24,7 +24,8 @@ import org.jetbrains.annotations.NotNull;
 @Warning(reason = "This event has been superseded by the Commands API and will be removed in a future release. Listen to LifecycleEvents.COMMANDS instead.", value = true)
 public class CommandRegisteredEvent<S extends com.destroystokyo.paper.brigadier.BukkitBrigadierCommandSource> extends ServerEvent implements Cancellable {
 
-    private static final HandlerList handlers = new HandlerList();
+    private static final HandlerList HANDLER_LIST = new HandlerList();
+
     private final String commandLabel;
     private final Command command;
     private final com.destroystokyo.paper.brigadier.BukkitBrigadierCommand<S> brigadierCommand;
@@ -32,7 +33,8 @@ public class CommandRegisteredEvent<S extends com.destroystokyo.paper.brigadier.
     private final ArgumentCommandNode<S, String> defaultArgs;
     private LiteralCommandNode<S> literal;
     private boolean rawCommand = false;
-    private boolean cancelled = false;
+
+    private boolean cancelled;
 
     public CommandRegisteredEvent(String commandLabel, com.destroystokyo.paper.brigadier.BukkitBrigadierCommand<S> brigadierCommand, Command command, RootCommandNode<S> root, LiteralCommandNode<S> literal, ArgumentCommandNode<S, String> defaultArgs) {
         this.commandLabel = commandLabel;
@@ -137,9 +139,6 @@ public class CommandRegisteredEvent<S extends com.destroystokyo.paper.brigadier.
         this.rawCommand = rawCommand;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public boolean isCancelled() {
         return this.cancelled;
@@ -148,7 +147,7 @@ public class CommandRegisteredEvent<S extends com.destroystokyo.paper.brigadier.
     /**
      * Cancels registering this command to Brigadier, but will remain in Bukkit Command Map. Can be used to hide a
      * command from all players.
-     *
+     * <p>
      * {@inheritDoc}
      */
     @Override
@@ -158,11 +157,11 @@ public class CommandRegisteredEvent<S extends com.destroystokyo.paper.brigadier.
 
     @NotNull
     public HandlerList getHandlers() {
-        return handlers;
+        return HANDLER_LIST;
     }
 
     @NotNull
     public static HandlerList getHandlerList() {
-        return handlers;
+        return HANDLER_LIST;
     }
 }

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

@@ -94,10 +94,10 @@ public class PlayerArmorChangeEvent extends PlayerEvent {
      */
     @Deprecated(since = "1.21.4")
     public enum SlotType {
-        HEAD(NETHERITE_HELMET, DIAMOND_HELMET, GOLDEN_HELMET, IRON_HELMET, CHAINMAIL_HELMET, LEATHER_HELMET, CARVED_PUMPKIN, PLAYER_HEAD, SKELETON_SKULL, ZOMBIE_HEAD, CREEPER_HEAD, WITHER_SKELETON_SKULL, TURTLE_HELMET, DRAGON_HEAD, PIGLIN_HEAD),
-        CHEST(NETHERITE_CHESTPLATE, DIAMOND_CHESTPLATE, GOLDEN_CHESTPLATE, IRON_CHESTPLATE, CHAINMAIL_CHESTPLATE, LEATHER_CHESTPLATE, ELYTRA),
-        LEGS(NETHERITE_LEGGINGS, DIAMOND_LEGGINGS, GOLDEN_LEGGINGS, IRON_LEGGINGS, CHAINMAIL_LEGGINGS, LEATHER_LEGGINGS),
-        FEET(NETHERITE_BOOTS, DIAMOND_BOOTS, GOLDEN_BOOTS, IRON_BOOTS, CHAINMAIL_BOOTS, LEATHER_BOOTS);
+        HEAD(COPPER_HELMET, NETHERITE_HELMET, DIAMOND_HELMET, GOLDEN_HELMET, IRON_HELMET, CHAINMAIL_HELMET, LEATHER_HELMET, CARVED_PUMPKIN, PLAYER_HEAD, SKELETON_SKULL, ZOMBIE_HEAD, CREEPER_HEAD, WITHER_SKELETON_SKULL, TURTLE_HELMET, DRAGON_HEAD, PIGLIN_HEAD),
+        CHEST(COPPER_CHESTPLATE, NETHERITE_CHESTPLATE, DIAMOND_CHESTPLATE, GOLDEN_CHESTPLATE, IRON_CHESTPLATE, CHAINMAIL_CHESTPLATE, LEATHER_CHESTPLATE, ELYTRA),
+        LEGS(COPPER_LEGGINGS, NETHERITE_LEGGINGS, DIAMOND_LEGGINGS, GOLDEN_LEGGINGS, IRON_LEGGINGS, CHAINMAIL_LEGGINGS, LEATHER_LEGGINGS),
+        FEET(COPPER_BOOTS, NETHERITE_BOOTS, DIAMOND_BOOTS, GOLDEN_BOOTS, IRON_BOOTS, CHAINMAIL_BOOTS, LEATHER_BOOTS);
 
         private final Set<Material> types;
 

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

@@ -221,12 +221,10 @@ public class PlayerHandshakeEvent extends Event implements Cancellable {
     }
 
     /**
-     * Determines if this event is cancelled.
+     * {@inheritDoc}
      * <p>
      * When this event is cancelled, custom handshake logic will not
      * be processed.
-     *
-     * @return {@code true} if this event is cancelled, {@code false} otherwise
      */
     @Override
     public boolean isCancelled() {
@@ -234,12 +232,10 @@ public class PlayerHandshakeEvent extends Event implements Cancellable {
     }
 
     /**
-     * Sets if this event is cancelled.
+     * {@inheritDoc}
      * <p>
      * When this event is cancelled, custom handshake logic will not
      * be processed.
-     *
-     * @param cancel {@code true} if this event is cancelled, {@code false} otherwise
      */
     @Override
     public void setCancelled(final boolean cancel) {

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

@@ -40,8 +40,6 @@ public class PlayerJumpEvent extends PlayerEvent implements Cancellable {
      * If this event is cancelled, the player will be moved or
      * teleported back to the Location as defined by {@link #getFrom()}. This will not
      * fire an event
-     *
-     * @return {@code true} if this event is cancelled
      */
     @Override
     public boolean isCancelled() {
@@ -54,8 +52,6 @@ public class PlayerJumpEvent extends PlayerEvent implements Cancellable {
      * If this event is cancelled, the player will be moved or
      * teleported back to the Location as defined by {@link #getFrom()}. This will not
      * fire an event
-     *
-     * @param cancel {@code true} if you wish to cancel this event
      */
     @Override
     public void setCancelled(final boolean cancel) {

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

@@ -6,6 +6,8 @@ import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
+import java.util.Objects;
+import java.util.UUID;
 
 /**
  * Allows a plugin to be notified anytime AFTER a Profile has been looked up from the Mojang API
@@ -28,8 +30,28 @@ public class LookupProfileEvent extends Event {
     }
 
     /**
-     * @return The profile that was recently looked up. This profile can be mutated
+     * Gets the name of the profile that was looked up.
+     *
+     * @return the name of the profile
      */
+    public String getName() {
+        return Objects.requireNonNull(this.profile.getName(), "profile name");
+    }
+
+    /**
+     * Gets the UUID of the profile that was looked up.
+     *
+     * @return the UUID of the profile
+     */
+    public UUID getId() {
+        return Objects.requireNonNull(this.profile.getId(), "profile id");
+    }
+
+    /**
+     * @return The profile that was recently looked up. This profile can be mutated
+     * @deprecated This event is only called after UUID lookups, properties set here will be ignored. Use {@link FillProfileEvent} for setting properties.
+     */
+    @Deprecated(forRemoval = true, since = "1.21.9")
     public PlayerProfile getPlayerProfile() {
         return this.profile;
     }

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

@@ -69,7 +69,9 @@ public class PreLookupProfileEvent extends Event {
     /**
      * @return The currently pending pre-populated properties.
      * Any property in this Set will be automatically prefilled on this Profile
+     * @deprecated This event is only called for UUID lookups, properties set here will be ignored. Use {@link PreFillProfileEvent} for setting properties.
      */
+    @Deprecated(forRemoval = true, since = "1.21.9")
     public Set<ProfileProperty> getProfileProperties() {
         return this.properties;
     }
@@ -79,18 +81,22 @@ public class PreLookupProfileEvent extends Event {
      * Any property in this Set will be automatically prefilled on this Profile
      *
      * @param properties The properties to add
+     * @deprecated This event is only called for UUID lookups, properties set here will be ignored. Use {@link PreFillProfileEvent} for setting properties.
      */
+    @Deprecated(forRemoval = true, since = "1.21.9")
     public void setProfileProperties(final Set<ProfileProperty> properties) {
         this.properties = new HashSet<>();
         this.properties.addAll(properties);
     }
 
     /**
-     * Adds any properties currently missing to the pre-populated properties set, replacing any that already were set.
+     * Adds any properties currently missing to the pre-populated properties set, replacing any that already were set. Use {@link PreFillProfileEvent} for setting properties.
      * Any property in this Set will be automatically prefilled on this Profile
      *
      * @param properties The properties to add
+     * @deprecated This event is only called for UUID lookups, properties set here will be ignored.
      */
+    @Deprecated(forRemoval = true, since = "1.21.9")
     public void addProfileProperties(final Set<ProfileProperty> properties) {
         this.properties.addAll(properties);
     }

paper-api/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java

@@ -4,15 +4,18 @@ import java.util.Collection;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
+import net.kyori.adventure.text.object.PlayerHeadObjectContents;
 import org.bukkit.profile.PlayerTextures;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
+import static net.kyori.adventure.text.object.PlayerHeadObjectContents.property;
+
 /**
  * Represents a players profile for the game, such as UUID, Name, and textures.
  */
 @NullMarked
-public interface PlayerProfile extends org.bukkit.profile.PlayerProfile {
+public interface PlayerProfile extends org.bukkit.profile.PlayerProfile, PlayerHeadObjectContents.SkinSource {
 
     /**
      * @return The players name, if set
@@ -51,7 +54,7 @@ public interface PlayerProfile extends org.bukkit.profile.PlayerProfile {
      * This will build a snapshot of the current texture data once
      * requested inside PlayerTextures.
      *
-     * @return the textures, not <code>null</code>
+     * @return the textures
      */
     @Override
     PlayerTextures getTextures();
@@ -59,14 +62,14 @@ public interface PlayerProfile extends org.bukkit.profile.PlayerProfile {
     /**
      * Copies the given textures.
      *
-     * @param textures the textures to copy, or <code>null</code> to clear the
+     * @param textures the textures to copy, or {@code null} to clear the
      * textures
      */
     @Override
     void setTextures(@Nullable PlayerTextures textures);
 
     /**
-     * @return A Mutable set of this players properties, such as textures.
+     * @return A Mutable set of this player's properties, such as textures.
      * Values specified here are subject to implementation details.
      */
     Set<ProfileProperty> getProperties();
@@ -251,4 +254,19 @@ public interface PlayerProfile extends org.bukkit.profile.PlayerProfile {
      */
     @Override
     PlayerProfile clone();
+
+    @Override
+    default void applySkinToPlayerHeadContents(final PlayerHeadObjectContents.Builder builder) {
+        if (this.getProperties().isEmpty() && (this.getName() != null) != (this.getId() != null)) {
+            if (this.getId() != null) {
+                builder.id(this.getId());
+            } else {
+                builder.name(this.getName());
+            }
+            return;
+        }
+        builder.id(this.getId())
+            .name(this.getName())
+            .profileProperties(this.getProperties().stream().map(prop -> property(prop.getName(), prop.getValue(), prop.getSignature())).toList());
+    }
 }

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

@@ -3,6 +3,9 @@ package com.destroystokyo.paper.util;
 import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
+/**
+ * @hidden
+ */
 @ApiStatus.Internal
 @NullMarked
 public final class SneakyThrow {

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

@@ -40,6 +40,9 @@ public interface VersionFetcher {
         return getVersionMessage();
     }
 
+    /**
+     * @hidden
+     */
     @ApiStatus.Internal
     class DummyVersionFetcher implements VersionFetcher {
 

paper-api/src/main/java/com/destroystokyo/paper/utils/CachedSizeConcurrentLinkedQueue.java

@@ -1,37 +0,0 @@
-package com.destroystokyo.paper.utils;
-
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.atomic.LongAdder;
-import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;
-import org.jspecify.annotations.Nullable;
-
-@NullMarked
-@ApiStatus.Internal
-public class CachedSizeConcurrentLinkedQueue<E> extends ConcurrentLinkedQueue<E> {
-
-    private final LongAdder cachedSize = new LongAdder();
-
-    @Override
-    public boolean add(final E e) {
-        final boolean result = super.add(e);
-        if (result) {
-            this.cachedSize.increment();
-        }
-        return result;
-    }
-
-    @Override
-    public @Nullable E poll() {
-        final E result = super.poll();
-        if (result != null) {
-            this.cachedSize.decrement();
-        }
-        return result;
-    }
-
-    @Override
-    public int size() {
-        return this.cachedSize.intValue();
-    }
-}

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

@@ -1,14 +1,18 @@
 package io.papermc.paper;
 
+import com.destroystokyo.paper.SkinParts;
 import io.papermc.paper.command.brigadier.CommandSourceStack;
+import io.papermc.paper.datacomponent.item.ResolvableProfile;
 import io.papermc.paper.world.damagesource.CombatEntry;
 import io.papermc.paper.world.damagesource.FallLocationType;
+import net.kyori.adventure.text.Component;
 import net.kyori.adventure.util.Services;
 import org.bukkit.block.Biome;
 import org.bukkit.damage.DamageEffect;
 import org.bukkit.damage.DamageSource;
 import org.bukkit.entity.LivingEntity;
 import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Contract;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
@@ -53,7 +57,7 @@ public interface InternalAPIBridge {
     @Deprecated(forRemoval = true, since = "1.21.5")
     @ApiStatus.ScheduledForRemoval(inVersion = "1.22")
     Biome constructLegacyCustomBiome();
-     
+
     /**
      * Creates a new combat entry.
      * <p>
@@ -86,5 +90,12 @@ public interface InternalAPIBridge {
      * @return wrapped predicate
      */
     Predicate<CommandSourceStack> restricted(Predicate<CommandSourceStack> predicate);
+
+    ResolvableProfile defaultMannequinProfile();
+
+    @Contract(value = "-> new", pure = true)
+    SkinParts.Mutable allSkinParts();
+
+    Component defaultMannequinDescription();
 }
 

paper-api/src/main/java/io/papermc/paper/annotation/GeneratedClass.java

@@ -1,4 +1,4 @@
-package io.papermc.paper.generated;
+package io.papermc.paper.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -8,14 +8,12 @@ import java.lang.annotation.Target;
 import org.jetbrains.annotations.ApiStatus;
 
 /**
- * Used to mark classes which are generated from
- * a specific version of minecraft.
+ * Used to mark classes which are generated.
+ * Any manual changes will be overwritten.
  */
 @ApiStatus.Internal
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
-public @interface GeneratedFrom {
-
-    String value();
+public @interface GeneratedClass {
 }

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

@@ -2,9 +2,12 @@ package io.papermc.paper.command.brigadier;
 
 import com.mojang.brigadier.RedirectModifier;
 import com.mojang.brigadier.tree.CommandNode;
+import net.kyori.adventure.text.ComponentLike;
+import org.bukkit.GameRule;
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.Nullable;
 
@@ -67,4 +70,34 @@ public interface CommandSourceStack {
      * @see com.mojang.brigadier.builder.ArgumentBuilder#fork(CommandNode, RedirectModifier)
      */
     CommandSourceStack withExecutor(Entity executor);
+
+    /**
+     * Sends a system message to the {@link #getExecutor()} if it is a {@link Player},
+     * otherwise sends a system message to the {@link #getSender()}.
+     *
+     * @param message the message to send
+     */
+    void sendToTarget(ComponentLike message);
+
+    /**
+     * Sends a system message to the {@link #getSender()}, admins, and console indicating successful command execution
+     * according to vanilla semantics.
+     *
+     * <p>This currently includes checking for environments with suppressed output,
+     * {@link GameRule#SEND_COMMAND_FEEDBACK}, and {@link GameRule#LOG_ADMIN_COMMANDS}.</p>
+     *
+     * @param message the message to send
+     * @param allowInformingAdmins whether admins and console may be informed of this success
+     */
+    void sendSuccess(ComponentLike message, boolean allowInformingAdmins);
+
+    /**
+     * Sends a system message indicating a failed command execution to the {@link #getSender()}.
+     * Does not apply red styling to the message as vanilla does to allow for custom failure message styling.
+     *
+     * <p>Respects vanilla semantics for accepting failure output and suppressed output environments.</p>
+     *
+     * @param message the message to send
+     */
+    void sendFailure(ComponentLike message);
 }

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

@@ -110,7 +110,7 @@ public final class ArgumentTypes {
 
     /**
      * A column block position argument.
-     * 
+     *
      * @return column block position argument
      */
     @ApiStatus.Experimental
@@ -120,7 +120,7 @@ public final class ArgumentTypes {
 
     /**
      * A block predicate argument.
-     * 
+     *
      * @return block predicate argument
      */
     @ApiStatus.Experimental

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

@@ -19,14 +19,12 @@ import io.papermc.paper.registry.RegistryKey;
 import io.papermc.paper.registry.TypedKey;
 import java.util.Optional;
 import java.util.ServiceLoader;
-import java.util.Set;
 import java.util.UUID;
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.text.format.TextColor;
-import org.bukkit.Axis;
 import org.bukkit.GameMode;
 import org.bukkit.HeightMap;
 import org.bukkit.NamespacedKey;
@@ -59,15 +57,15 @@ interface VanillaArgumentProvider {
     ArgumentType<PlayerProfileListResolver> playerProfiles();
 
     ArgumentType<BlockPositionResolver> blockPosition();
-    
+
     ArgumentType<ColumnBlockPositionResolver> columnBlockPosition();
 
     ArgumentType<FinePositionResolver> finePosition(boolean centerIntegers);
-    
+
     ArgumentType<ColumnFinePositionResolver> columnFinePosition(boolean centerIntegers);
 
     ArgumentType<RotationResolver> rotation();
-    
+
     ArgumentType<AngleResolver> angle();
 
     ArgumentType<AxisSet> axes();
@@ -102,7 +100,7 @@ interface VanillaArgumentProvider {
     ArgumentType<DoubleRangeProvider> doubleRange();
 
     ArgumentType<World> world();
-    
+
     ArgumentType<GameMode> gameMode();
 
     ArgumentType<HeightMap> heightMap();

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

@@ -9,7 +9,7 @@ import org.jetbrains.annotations.ApiStatus;
  * An {@link ArgumentResolver} that's capable of resolving
  * a column block position argument value using a {@link CommandSourceStack}.
  *
- * @see ArgumentTypes#columnBlockPosition() 
+ * @see ArgumentTypes#columnBlockPosition()
  */
 @ApiStatus.Experimental
 @ApiStatus.NonExtendable

paper-api/src/main/java/io/papermc/paper/connection/PlayerConnection.java

@@ -10,7 +10,7 @@ public interface PlayerConnection {
     /**
      * Disconnects the player connection.
      * <p>
-     * Note that calling this during connection related events may caused undefined behavior.
+     * Note that calling this during connection related events may cause undefined behavior.
      *
      * @param component disconnect reason
      */

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

@@ -70,6 +70,10 @@ interface ItemComponentTypesBridge {
 
     ResolvableProfile.Builder resolvableProfile();
 
+    ResolvableProfile.SkinPatchBuilder skinPatch();
+
+    ResolvableProfile.SkinPatch emptySkinPatch();
+
     ResolvableProfile resolvableProfile(PlayerProfile profile);
 
     BannerPatternLayers.Builder bannerPatternLayers();

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

@@ -6,6 +6,10 @@ import io.papermc.paper.datacomponent.DataComponentBuilder;
 import java.util.Collection;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
+import java.util.function.Consumer;
+import net.kyori.adventure.key.Key;
+import net.kyori.adventure.text.object.PlayerHeadObjectContents;
+import org.bukkit.profile.PlayerTextures;
 import org.intellij.lang.annotations.Pattern;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
@@ -15,12 +19,13 @@ import org.jspecify.annotations.Nullable;
 
 /**
  * Holds player profile data that can be resolved to a {@link PlayerProfile}.
+ *
  * @see io.papermc.paper.datacomponent.DataComponentTypes#PROFILE
  */
 @NullMarked
 @ApiStatus.Experimental
 @ApiStatus.NonExtendable
-public interface ResolvableProfile {
+public interface ResolvableProfile extends PlayerHeadObjectContents.SkinSource {
 
     @Contract(value = "_ -> new", pure = true)
     static ResolvableProfile resolvableProfile(final PlayerProfile profile) {
@@ -33,27 +38,53 @@ public interface ResolvableProfile {
     }
 
     @Contract(pure = true)
-    @Nullable UUID uuid();
+    @Nullable
+    UUID uuid();
 
     @Contract(pure = true)
-    @Nullable String name();
+    @Nullable
+    String name();
 
     @Contract(pure = true)
-    @Unmodifiable Collection<ProfileProperty> properties();
+    @Unmodifiable
+    Collection<ProfileProperty> properties();
 
     /**
-     * Produces an updated player profile based on this.
-     * <p>
-     * This tries to produce a completed profile by filling in missing
-     * properties (name, unique id, textures, etc.), and updates existing
-     * properties (e.g. name, textures, etc.) to their official and up-to-date
-     * values. This operation does not alter the current profile, but produces a
-     * new updated {@link PlayerProfile}.
-     * <p>
-     * If no player exists for the unique id or name of this profile, this
-     * operation yields a profile that is equal to the current profile, which
-     * might not be complete.
+     * Whether this resolvable profile was marked as dynamic.
      * <p>
+     * A dynamic resolvable profile is required to either have a non-null {@link #uuid()} or {@link #name()}
+     * and will be resolved by the client via a network call.
+     * A dynamic profile will also not include any properties.
+     *
+     * @return {@code true} if this profile is marked as dynamic, {@code false} otherwise.
+     */
+    @Contract(pure = true)
+    boolean dynamic();
+
+    /**
+     * Produces an updated player profile based on this {@link ResolvableProfile}, mirroring client behavior.
+     *
+     * <ul>
+     *     <li>
+     *         For {@link #dynamic()} profiles:
+     *
+     *         <p>This tries to produce a completed profile by filling in missing
+     *         properties (name, unique id, textures, etc.), and updates existing
+     *         properties (e.g. name) to their official and up-to-date
+     *         values. This operation does not alter the current profile, but produces a
+     *         new updated {@link PlayerProfile}.</p>
+     *
+     *         <p>If no player exists for the unique id or name of this profile, this
+     *         operation yields a profile that is equal to the current profile, which
+     *         might not be complete.</p>
+     *     </li>
+     *     <li>
+     *         For static (non-{@link #dynamic()}) profiles:
+     *         <p>Completes with a profile containing all of {@link #properties()} exactly,
+     *         and null {@link #name()}/{@link #uuid()} replaced by filler values.</p>
+     *     </li>
+     * </ul>
+     *
      * This is an asynchronous operation: Updating the profile can result in an
      * outgoing connection in another thread in order to fetch the latest
      * profile properties. The returned {@link CompletableFuture} will be
@@ -72,6 +103,125 @@ public interface ResolvableProfile {
     @Contract(pure = true)
     CompletableFuture<PlayerProfile> resolve();
 
+    /**
+     * Gets the skin patch used by the client for rendering. Overrides any values
+     * resolved from the profile.
+     *
+     * @return the skin patch
+     */
+    @Contract(pure = true)
+    SkinPatch skinPatch();
+
+    /**
+     * Override rendering options for a {@link ResolvableProfile}.
+     */
+    @ApiStatus.Experimental
+    @ApiStatus.NonExtendable
+    interface SkinPatch {
+
+        /**
+         * Returns the empty skin patch that does not override anything.
+         *
+         * @return the empty skin patch
+         */
+        static SkinPatch empty() {
+            final class Holder {
+                static final SkinPatch INSTANCE = ItemComponentTypesBridge.bridge().emptySkinPatch();
+            }
+            return Holder.INSTANCE;
+        }
+
+        /**
+         * Creates a new builder for a skin patch.
+         *
+         * @return new skin patch builder
+         */
+        @Contract(value = "-> new", pure = true)
+        static SkinPatchBuilder skinPatch() {
+            return ItemComponentTypesBridge.bridge().skinPatch();
+        }
+
+        /**
+         * Gets the body texture key.
+         *
+         * @return the body texture key, or {@code null} if not set
+         */
+        @Nullable Key body();
+
+        /**
+         * Gets the cape texture key.
+         *
+         * @return the cape texture key, or {@code null} if not set
+         */
+        @Nullable Key cape();
+
+        /**
+         * Gets the elytra texture key.
+         *
+         * @return the elytra texture key, or {@code null} if not set
+         */
+        @Nullable Key elytra();
+
+        /**
+         * Gets the skin model.
+         *
+         * @return the skin model, or {@code null} if not set
+         */
+        PlayerTextures.@Nullable SkinModel model();
+
+        /**
+         * Returns if this skin patch does not override any values.
+         *
+         * @return {@code true} if this skin patch is empty
+         */
+        default boolean isEmpty() {
+            return this.body() == null && this.cape() == null && this.elytra() == null && this.model() == null;
+        }
+    }
+
+    /**
+     * Builder for {@link SkinPatch}.
+     */
+    @ApiStatus.Experimental
+    @ApiStatus.NonExtendable
+    interface SkinPatchBuilder extends DataComponentBuilder<SkinPatch> {
+        /**
+         * Sets the body texture key.
+         *
+         * @param body the body texture key, or {@code null} to unset it
+         * @return the builder for chaining
+         */
+        @Contract(value = "_ -> this", mutates = "this")
+        SkinPatchBuilder body(@Nullable Key body);
+
+        /**
+         * Sets the cape texture key.
+         *
+         * @param cape the cape texture key, or {@code null} to unset it
+         * @return the builder for chaining
+         */
+        @Contract(value = "_ -> this", mutates = "this")
+        SkinPatchBuilder cape(@Nullable Key cape);
+
+        /**
+         * Sets the elytra texture key.
+         *
+         * @param elytra the elytra texture key, or {@code null} to unset it
+         * @return the builder for chaining
+         */
+        @Contract(value = "_ -> this", mutates = "this")
+        SkinPatchBuilder elytra(@Nullable Key elytra);
+
+        /**
+         * Sets the skin model.
+         *
+         * @param model the skin model, or {@code null} to unset it
+         * @return the builder for chaining
+         */
+        @Contract(value = "_ -> this", mutates = "this")
+        SkinPatchBuilder model(PlayerTextures.@Nullable SkinModel model);
+    }
+
     /**
      * Builder for {@link ResolvableProfile}.
      */
@@ -119,5 +269,25 @@ public interface ResolvableProfile {
          */
         @Contract(value = "_ -> this", mutates = "this")
         Builder addProperties(Collection<ProfileProperty> properties);
+
+        /**
+         * Sets the skin patch for this profile.
+         *
+         * @param patch the skin patch
+         * @return the builder for chaining
+         * @see #skinPatch()
+         */
+        @Contract(value = "_ -> this", mutates = "this")
+        Builder skinPatch(SkinPatch patch);
+
+        /**
+         * Configures the skin patch for this profile.
+         *
+         * @param configure the configuration consumer
+         * @return the builder for chaining
+         * @see #skinPatch()
+         */
+        @Contract(value = "_ -> this", mutates = "this")
+        Builder skinPatch(Consumer<SkinPatchBuilder> configure);
     }
 }

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

@@ -8,7 +8,6 @@ import org.jetbrains.annotations.ApiStatus;
 @ApiStatus.Experimental
 public enum ItemUseAnimation {
     // Start generate - ItemUseAnimation
-    // @GeneratedFrom 1.21.8
     NONE,
     EAT,
     DRINK,

paper-api/src/main/java/io/papermc/paper/dialog/Dialog.java

@@ -33,7 +33,6 @@ public interface Dialog extends Keyed, DialogLike {
     }
 
     // Start generate - Dialog
-    // @GeneratedFrom 1.21.8
     Dialog CUSTOM_OPTIONS = getDialog("custom_options");
 
     Dialog QUICK_ACTIONS = getDialog("quick_actions");

paper-api/src/main/java/io/papermc/paper/entity/TeleportFlag.java

@@ -39,7 +39,7 @@ public sealed interface TeleportFlag permits TeleportFlag.EntityState, TeleportF
          */
         VELOCITY_ROTATION;
         /**
-         * Configures the player to not loose velocity in their x axis during the teleport.
+         * Configures the player to not lose velocity in their x axis during the teleport.
          * @deprecated Since 1.21.3, vanilla split up the relative teleport flags into velocity and position related
          * ones. As the API does not deal with position relative flags, this name is no longer applicable.
          * Use {@link #VELOCITY_X} instead.
@@ -47,7 +47,7 @@ public sealed interface TeleportFlag permits TeleportFlag.EntityState, TeleportF
         @Deprecated(since = "1.21.3", forRemoval = true)
         public static final Relative X = VELOCITY_X;
         /**
-         * Configures the player to not loose velocity in their y axis during the teleport.
+         * Configures the player to not lose velocity in their y axis during the teleport.
          * @deprecated Since 1.21.3, vanilla split up the relative teleport flags into velocity and position related
          * ones. As the API does not deal with position relative flags, this name is no longer applicable.
          * Use {@link #VELOCITY_Y} instead.
@@ -55,7 +55,7 @@ public sealed interface TeleportFlag permits TeleportFlag.EntityState, TeleportF
         @Deprecated(since = "1.21.3", forRemoval = true)
         public static final Relative Y = VELOCITY_Y;
         /**
-         * Configures the player to not loose velocity in their z axis during the teleport.
+         * Configures the player to not lose velocity in their z axis during the teleport.
          * @deprecated Since 1.21.3, vanilla split up the relative teleport flags into velocity and position related
          * ones. As the API does not deal with position relative flags, this name is no longer applicable.
          * Use {@link #VELOCITY_Z} instead.

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

@@ -1,6 +1,5 @@
 package io.papermc.paper.event.block;
 
-import com.google.common.base.Preconditions;
 import org.bukkit.block.Block;
 import org.bukkit.block.data.type.Vault;
 import org.bukkit.entity.Player;
@@ -16,12 +15,14 @@ import org.jspecify.annotations.Nullable;
  */
 @NullMarked
 public class VaultChangeStateEvent extends BlockEvent implements Cancellable {
+
     private static final HandlerList HANDLER_LIST = new HandlerList();
 
     private final @Nullable Player player;
     private final Vault.State currentState;
     private final Vault.State newState;
-    private boolean cancelled = false;
+
+    private boolean cancelled;
 
     @ApiStatus.Internal
     public VaultChangeStateEvent(final Block vaultBlock, final @Nullable Player player, final Vault.State currentState, final Vault.State newState) {
@@ -46,7 +47,7 @@ public class VaultChangeStateEvent extends BlockEvent implements Cancellable {
      * @return The current vault state.
      */
     public Vault.State getCurrentState() {
-        return currentState;
+        return this.currentState;
     }
 
     /**
@@ -55,7 +56,7 @@ public class VaultChangeStateEvent extends BlockEvent implements Cancellable {
      * @return The new vault state.
      */
     public Vault.State getNewState() {
-        return newState;
+        return this.newState;
     }
 
     @Override

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

@@ -50,8 +50,8 @@ public class EntityAttemptSpinAttackEvent extends EntityEvent implements Cancell
      * and bounce away.
      */
     @Override
-    public void setCancelled(boolean cancelled) {
-        this.cancelled = cancelled;
+    public void setCancelled(boolean cancel) {
+        this.cancelled = cancel;
     }
 
     @Override

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

@@ -14,7 +14,7 @@ import org.jspecify.annotations.NullMarked;
  * as multiple acceleration calculations are done.
  */
 @NullMarked
-public class EntityPushedByEntityAttackEvent extends EntityKnockbackEvent implements Cancellable {
+public class EntityPushedByEntityAttackEvent extends EntityKnockbackEvent {
 
     private final Entity pushedBy;
 
@@ -54,14 +54,4 @@ public class EntityPushedByEntityAttackEvent extends EntityKnockbackEvent implem
     public void setAcceleration(final Vector acceleration) {
         super.setKnockback(acceleration);
     }
-
-    @Override
-    public boolean isCancelled() {
-        return super.isCancelled();
-    }
-
-    @Override
-    public void setCancelled(final boolean cancel) {
-        super.setCancelled(cancel);
-    }
 }

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

@@ -0,0 +1,71 @@
+package io.papermc.paper.event.entity;
+
+import org.bukkit.block.Block;
+import org.bukkit.entity.CopperGolem;
+import org.bukkit.entity.Entity;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.entity.EntityEvent;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Called when an item-transporting entity (typically a {@link CopperGolem},
+ * although other entities may be possible through non-API means)
+ * is searching for or validating an existing target container block for
+ * taking or depositing items.
+ *
+ * <p>This may be called multiple times per entity per tick, so listeners
+ * should be careful to implement checks in an efficient manner.</p>
+ */
+@NullMarked
+public class ItemTransportingEntityValidateTargetEvent extends EntityEvent {
+    protected static final HandlerList HANDLER_LIST = new HandlerList();
+
+    private final Block block;
+    private boolean allowed = true;
+
+    @ApiStatus.Internal
+    public ItemTransportingEntityValidateTargetEvent(
+        final Entity entity,
+        final Block block
+    ) {
+        super(entity);
+        this.block = block;
+    }
+
+    /**
+     * Sets if the entity is allowed to use {@link #getBlock()} as a target.
+     *
+     * @param allowed whether the target is allowed
+     */
+    public void setAllowed(boolean allowed) {
+        this.allowed = allowed;
+    }
+
+    /**
+     * Gets if the entity is allowed to use {@link #getBlock()} as a target.
+     *
+     * @return true if the target is allowed
+     */
+    public boolean isAllowed() {
+        return this.allowed;
+    }
+
+    /**
+     * Gets the target block the entity is validating.
+     *
+     * @return the target block
+     */
+    public Block getBlock() {
+        return this.block;
+    }
+
+    public static HandlerList getHandlerList() {
+        return HANDLER_LIST;
+    }
+
+    @Override
+    public HandlerList getHandlers() {
+        return HANDLER_LIST;
+    }
+}

paper-api/src/main/java/io/papermc/paper/event/packet/UncheckedSignChangeEvent.java

@@ -28,11 +28,13 @@ import org.jspecify.annotations.NullMarked;
 public class UncheckedSignChangeEvent extends PlayerEvent implements Cancellable {
 
     private static final HandlerList HANDLER_LIST = new HandlerList();
-    private boolean cancel = false;
+
     private final BlockPosition editedBlockPosition;
     private final Side side;
     private final List<Component> lines;
 
+    private boolean cancelled;
+
     @ApiStatus.Internal
     public UncheckedSignChangeEvent(
         final Player editor,
@@ -52,7 +54,7 @@ public class UncheckedSignChangeEvent extends PlayerEvent implements Cancellable
      * @return location where the change happened
      */
     public BlockPosition getEditedBlockPosition() {
-        return editedBlockPosition;
+        return this.editedBlockPosition;
     }
 
     /**
@@ -61,7 +63,7 @@ public class UncheckedSignChangeEvent extends PlayerEvent implements Cancellable
      * @return {@link Side} that was edited
      */
     public Side getSide() {
-        return side;
+        return this.side;
     }
 
     /**
@@ -70,17 +72,17 @@ public class UncheckedSignChangeEvent extends PlayerEvent implements Cancellable
      * @return the lines
      */
     public @Unmodifiable List<Component> lines() {
-        return Collections.unmodifiableList(lines);
+        return Collections.unmodifiableList(this.lines);
     }
 
     @Override
     public boolean isCancelled() {
-        return cancel;
+        return this.cancelled;
     }
 
     @Override
     public void setCancelled(final boolean cancel) {
-        this.cancel = cancel;
+        this.cancelled = cancel;
     }
 
     @Override

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

@@ -0,0 +1,84 @@
+package io.papermc.paper.event.player;
+
+import io.papermc.paper.connection.PlayerConfigurationConnection;
+import org.bukkit.Location;
+import org.bukkit.Server;
+import org.bukkit.World;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Called when selecting a player's spawn location (i.e. joining the server or reconfiguring).
+ *
+ * <p>The player will be kept in the configuration phase until all event handlers return and
+ * the spawn location is loaded.</p>
+ */
+@ApiStatus.Experimental
+@NullMarked
+public class AsyncPlayerSpawnLocationEvent extends Event {
+
+    private static final HandlerList HANDLER_LIST = new HandlerList();
+
+    private final PlayerConfigurationConnection connection;
+    private final boolean newPlayer;
+    private Location spawnLocation;
+
+    @ApiStatus.Internal
+    public AsyncPlayerSpawnLocationEvent(final PlayerConfigurationConnection connection, final Location spawnLocation, final boolean newPlayer) {
+        super(true);
+        this.connection = connection;
+        this.spawnLocation = spawnLocation;
+        this.newPlayer = newPlayer;
+    }
+
+    /**
+     * Gets the spawning player's connection.
+     *
+     * @return the player connection
+     */
+    public PlayerConfigurationConnection getConnection() {
+        return this.connection;
+    }
+
+    /**
+     * Gets the player's spawn location.
+     *
+     * <p>If the player has played on this server before, defaults to the location inside the player data file.
+     * For new players, the default spawn location is the {@link World#getSpawnLocation() spawn location}
+     * of the {@link Server#getRespawnWorld() respawn world}.</p>
+     *
+     * @return the spawn location
+     */
+    public Location getSpawnLocation() {
+        return this.spawnLocation;
+    }
+
+    /**
+     * Sets player's spawn location.
+     *
+     * @param location the spawn location
+     */
+    public void setSpawnLocation(final Location location) {
+        this.spawnLocation = location.clone();
+    }
+
+    /**
+     * Returns true if the player is joining the server for the first time.
+     *
+     * @return whether the player is new
+     */
+    public boolean isNewPlayer() {
+        return this.newPlayer;
+    }
+
+    @Override
+    public HandlerList getHandlers() {
+        return HANDLER_LIST;
+    }
+
+    public static HandlerList getHandlerList() {
+        return HANDLER_LIST;
+    }
+}

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

@@ -15,6 +15,7 @@ import org.jspecify.annotations.Nullable;
 
 /**
  * This event is fired for any custom click events.
+ *
  * @see net.kyori.adventure.text.event.ClickEvent#custom(Key, BinaryTagHolder)
  * @see io.papermc.paper.registry.data.dialog.action.DialogAction#customClick(DialogActionCallback, ClickCallback.Options)
  */

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

@@ -20,10 +20,12 @@ import org.jspecify.annotations.NullMarked;
 public class PlayerInsertLecternBookEvent extends PlayerEvent implements Cancellable {
 
     private static final HandlerList HANDLER_LIST = new HandlerList();
-    private boolean cancelled = false;
+
     private final Block block;
     private ItemStack book;
 
+    private boolean cancelled;
+
     @ApiStatus.Internal
     public PlayerInsertLecternBookEvent(final Player player, final Block block, final ItemStack book) {
         super(player);

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

@@ -10,7 +10,7 @@ import org.jetbrains.annotations.ApiStatus;
 import org.jspecify.annotations.NullMarked;
 
 /**
- * Called when a player selects a banner patten in a loom inventory.
+ * Called when a player selects a banner pattern in a loom inventory.
  */
 @NullMarked
 public class PlayerLoomPatternSelectEvent extends PlayerEvent implements Cancellable {

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

@@ -13,6 +13,7 @@ import org.jspecify.annotations.NullMarked;
  */
 @NullMarked
 public class PlayerPickBlockEvent extends PlayerPickItemEvent {
+
     private final Block block;
 
     @ApiStatus.Internal

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

@@ -13,6 +13,7 @@ import org.jspecify.annotations.NullMarked;
  */
 @NullMarked
 public class PlayerPickEntityEvent extends PlayerPickItemEvent {
+
     private final Entity entity;
 
     @ApiStatus.Internal

paper-api/src/main/java/io/papermc/paper/event/world/WorldDifficultyChangeEvent.java

@@ -36,7 +36,7 @@ public class WorldDifficultyChangeEvent extends WorldEvent {
      * @return {@code null} if the difficulty was changed via api, otherwise the {@link CommandSourceStack}.
      */
     public @Nullable CommandSourceStack getCommandSource() {
-        return commandSource;
+        return this.commandSource;
     }
 
     /**
@@ -45,7 +45,7 @@ public class WorldDifficultyChangeEvent extends WorldEvent {
      * @return the new difficulty.
      */
     public Difficulty getDifficulty() {
-        return difficulty;
+        return this.difficulty;
     }
 
     @Override

paper-api/src/main/java/io/papermc/paper/persistence/PersistentDataContainerView.java

@@ -39,7 +39,7 @@ public interface PersistentDataContainerView {
      * using your namespace.
      *
      * @param key the key the value is stored under
-     * @param type the type the primative stored value has to match
+     * @param type the type the primitive stored value has to match
      * @param <P> the generic type of the stored primitive
      * @param <C> the generic type of the eventually created complex object
      * @return if a value with the provided key and type exists
@@ -71,7 +71,7 @@ public interface PersistentDataContainerView {
      * {@link PersistentDataHolder} instance.
      *
      * @param key the key to look up in the custom tag map
-     * @param type the type the value must have and will be casted to
+     * @param type the type the value must have and will be cast to
      * @param <P> the generic type of the stored primitive
      * @param <C> the generic type of the eventually created complex object
      * @return the value or {@code null} if no value was mapped under the given
@@ -93,7 +93,7 @@ public interface PersistentDataContainerView {
      * container, the default value provided is returned.
      *
      * @param key the key to look up in the custom tag map
-     * @param type the type the value must have and will be casted to
+     * @param type the type the value must have and will be cast to
      * @param defaultValue the default value to return if no value was found for
      * the provided key
      * @param <P> the generic type of the stored primitive