diff --git a/paper-api/src/main/java/io/papermc/paper/datacomponent/item/consumable/ItemUseAnimation.java b/paper-api/src/main/java/io/papermc/paper/datacomponent/item/consumable/ItemUseAnimation.java
index ebe48c360c1..f2bda943618 100644
--- a/paper-api/src/main/java/io/papermc/paper/datacomponent/item/consumable/ItemUseAnimation.java
+++ b/paper-api/src/main/java/io/papermc/paper/datacomponent/item/consumable/ItemUseAnimation.java
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.ApiStatus;
 @ApiStatus.Experimental
 public enum ItemUseAnimation {
     // Start generate - ItemUseAnimation
-    // @GeneratedFrom 1.21.6-rc1
+    // @GeneratedFrom 1.21.6
     NONE,
     EAT,
     DRINK,
diff --git a/paper-api/src/main/java/io/papermc/paper/registry/event/RegistryEvents.java b/paper-api/src/main/java/io/papermc/paper/registry/event/RegistryEvents.java
index e9f639f2099..35559cfb79a 100644
--- a/paper-api/src/main/java/io/papermc/paper/registry/event/RegistryEvents.java
+++ b/paper-api/src/main/java/io/papermc/paper/registry/event/RegistryEvents.java
@@ -35,7 +35,7 @@ import static io.papermc.paper.registry.event.RegistryEventProviderImpl.create;
 public final class RegistryEvents {
 
     // Start generate - RegistryEvents
-    // @GeneratedFrom 1.21.6-rc1
+    // @GeneratedFrom 1.21.6
     public static final RegistryEventProvider<GameEvent, GameEventRegistryEntry.Builder> GAME_EVENT = create(RegistryKey.GAME_EVENT);
     public static final RegistryEventProvider<DamageType, DamageTypeRegistryEntry.Builder> DAMAGE_TYPE = create(RegistryKey.DAMAGE_TYPE);
     public static final RegistryEventProvider<Wolf.Variant, WolfVariantRegistryEntry.Builder> WOLF_VARIANT = create(RegistryKey.WOLF_VARIANT);
diff --git a/paper-api/src/main/java/org/bukkit/Art.java b/paper-api/src/main/java/org/bukkit/Art.java
index a98c9f7f72f..0d4eba413c4 100644
--- a/paper-api/src/main/java/org/bukkit/Art.java
+++ b/paper-api/src/main/java/org/bukkit/Art.java
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable;
 public interface Art extends OldEnum<Art>, Keyed {
 
     // Start generate - Art
-    // @GeneratedFrom 1.21.6-rc1
+    // @GeneratedFrom 1.21.6
     Art ALBAN = getArt("alban");
 
     Art AZTEC = getArt("aztec");
diff --git a/paper-api/src/main/java/org/bukkit/FeatureFlag.java b/paper-api/src/main/java/org/bukkit/FeatureFlag.java
index 4dc3ec75a5b..1acfd658897 100644
--- a/paper-api/src/main/java/org/bukkit/FeatureFlag.java
+++ b/paper-api/src/main/java/org/bukkit/FeatureFlag.java
@@ -15,7 +15,7 @@ import org.jetbrains.annotations.ApiStatus;
 public interface FeatureFlag extends Keyed {
 
     // Start generate - FeatureFlag
-    // @GeneratedFrom 1.21.6-rc1
+    // @GeneratedFrom 1.21.6
     @ApiStatus.Experimental
     FeatureFlag MINECART_IMPROVEMENTS = create("minecart_improvements");
 
diff --git a/paper-api/src/main/java/org/bukkit/Fluid.java b/paper-api/src/main/java/org/bukkit/Fluid.java
index 283a0b71773..c99830b1f9e 100644
--- a/paper-api/src/main/java/org/bukkit/Fluid.java
+++ b/paper-api/src/main/java/org/bukkit/Fluid.java
@@ -13,7 +13,7 @@ import org.jetbrains.annotations.NotNull;
 public interface Fluid extends OldEnum<Fluid>, Keyed {
 
     // Start generate - Fluid
-    // @GeneratedFrom 1.21.6-rc1
+    // @GeneratedFrom 1.21.6
     Fluid EMPTY = getFluid("empty");
 
     Fluid FLOWING_LAVA = getFluid("flowing_lava");
diff --git a/paper-api/src/main/java/org/bukkit/GameEvent.java b/paper-api/src/main/java/org/bukkit/GameEvent.java
index bc125214f13..cef44e240ac 100644
--- a/paper-api/src/main/java/org/bukkit/GameEvent.java
+++ b/paper-api/src/main/java/org/bukkit/GameEvent.java
@@ -12,7 +12,7 @@ import org.jetbrains.annotations.Nullable;
 public abstract class GameEvent implements Keyed {
 
     // Start generate - GameEvent
-    // @GeneratedFrom 1.21.6-rc1
+    // @GeneratedFrom 1.21.6
     public static final GameEvent BLOCK_ACTIVATE = getEvent("block_activate");
 
     public static final GameEvent BLOCK_ATTACH = getEvent("block_attach");
diff --git a/paper-api/src/main/java/org/bukkit/JukeboxSong.java b/paper-api/src/main/java/org/bukkit/JukeboxSong.java
index 860152202c3..6e6fae9ff9c 100644
--- a/paper-api/src/main/java/org/bukkit/JukeboxSong.java
+++ b/paper-api/src/main/java/org/bukkit/JukeboxSong.java
@@ -12,7 +12,7 @@ import org.jetbrains.annotations.NotNull;
 public interface JukeboxSong extends Keyed, Translatable {
 
     // Start generate - JukeboxSong
-    // @GeneratedFrom 1.21.6-rc1
+    // @GeneratedFrom 1.21.6
     JukeboxSong ELEVEN = get("11");
 
     JukeboxSong THIRTEEN = get("13");
diff --git a/paper-api/src/main/java/org/bukkit/Material.java b/paper-api/src/main/java/org/bukkit/Material.java
index 6a559381d4a..ac8d1401094 100644
--- a/paper-api/src/main/java/org/bukkit/Material.java
+++ b/paper-api/src/main/java/org/bukkit/Material.java
@@ -145,7 +145,7 @@ import org.jetbrains.annotations.Nullable;
 public enum Material implements Keyed, Translatable, net.kyori.adventure.translation.Translatable { // Paper
     //<editor-fold desc="Materials" defaultstate="collapsed">
     // Start generate - Items
-    // @GeneratedFrom 1.21.6-rc1
+    // @GeneratedFrom 1.21.6
     ACACIA_BOAT(-1, 1),
     ACACIA_CHEST_BOAT(-1, 1),
     AIR(-1),
@@ -611,7 +611,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
     ZOMBIFIED_PIGLIN_SPAWN_EGG(-1),
     // End generate - Items
     // Start generate - Blocks
-    // @GeneratedFrom 1.21.6-rc1
+    // @GeneratedFrom 1.21.6
     ACACIA_BUTTON(-1, Switch.class),
     ACACIA_DOOR(-1, Door.class),
     ACACIA_FENCE(-1, Fence.class),
diff --git a/paper-api/src/main/java/org/bukkit/MusicInstrument.java b/paper-api/src/main/java/org/bukkit/MusicInstrument.java
index 1e975fd76b9..3959d0e3ef7 100644
--- a/paper-api/src/main/java/org/bukkit/MusicInstrument.java
+++ b/paper-api/src/main/java/org/bukkit/MusicInstrument.java
@@ -13,7 +13,7 @@ import org.jspecify.annotations.Nullable;
 public abstract class MusicInstrument implements Keyed, net.kyori.adventure.translation.Translatable {
 
     // Start generate - MusicInstrument
-    // @GeneratedFrom 1.21.6-rc1
+    // @GeneratedFrom 1.21.6
     public static final MusicInstrument ADMIRE_GOAT_HORN = getInstrument("admire_goat_horn");
 
     public static final MusicInstrument CALL_GOAT_HORN = getInstrument("call_goat_horn");
diff --git a/paper-api/src/main/java/org/bukkit/Sound.java b/paper-api/src/main/java/org/bukkit/Sound.java
index 6f54ee85e5e..0201bc80703 100644
--- a/paper-api/src/main/java/org/bukkit/Sound.java
+++ b/paper-api/src/main/java/org/bukkit/Sound.java
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull;
 public interface Sound extends OldEnum<Sound>, Keyed, net.kyori.adventure.sound.Sound.Type { // Paper - implement Sound.Type
 
     // Start generate - Sound
-    // @GeneratedFrom 1.21.6-rc1
+    // @GeneratedFrom 1.21.6
     Sound AMBIENT_BASALT_DELTAS_ADDITIONS = getSound("ambient.basalt_deltas.additions");
 
     Sound AMBIENT_BASALT_DELTAS_LOOP = getSound("ambient.basalt_deltas.loop");
diff --git a/paper-api/src/main/java/org/bukkit/SoundCategory.java b/paper-api/src/main/java/org/bukkit/SoundCategory.java
index eb7457dad04..44fed7472ca 100644
--- a/paper-api/src/main/java/org/bukkit/SoundCategory.java
+++ b/paper-api/src/main/java/org/bukkit/SoundCategory.java
@@ -10,7 +10,7 @@ import org.jspecify.annotations.NullMarked;
 public enum SoundCategory implements Sound.Source.Provider {
 
     // Start generate - SoundCategory
-    // @GeneratedFrom 1.21.6-rc1
+    // @GeneratedFrom 1.21.6
     MASTER,
     MUSIC,
     RECORDS,
diff --git a/paper-api/src/main/java/org/bukkit/Statistic.java b/paper-api/src/main/java/org/bukkit/Statistic.java
index 72e5c2f7e17..cc010539588 100644
--- a/paper-api/src/main/java/org/bukkit/Statistic.java
+++ b/paper-api/src/main/java/org/bukkit/Statistic.java
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
  */
 public enum Statistic implements Keyed {
     // Start generate - StatisticCustom
-    // @GeneratedFrom 1.21.6-rc1
+    // @GeneratedFrom 1.21.6
     ANIMALS_BRED,
     AVIATE_ONE_CM,
     BELL_RING,
@@ -87,7 +87,7 @@ public enum Statistic implements Keyed {
     WALK_UNDER_WATER_ONE_CM,
     // End generate - StatisticCustom
     // Start generate - StatisticType
-    // @GeneratedFrom 1.21.6-rc1
+    // @GeneratedFrom 1.21.6
     BREAK_ITEM(Type.ITEM),
     CRAFT_ITEM(Type.ITEM),
     DROP(Type.ITEM),
diff --git a/paper-api/src/main/java/org/bukkit/Tag.java b/paper-api/src/main/java/org/bukkit/Tag.java
index fb15471586f..484c9db66e0 100644
--- a/paper-api/src/main/java/org/bukkit/Tag.java
+++ b/paper-api/src/main/java/org/bukkit/Tag.java
@@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull;
 public interface Tag<T extends Keyed> extends Keyed {
 
     // Start generate - Tag
-    // @GeneratedFrom 1.21.6-rc1
+    // @GeneratedFrom 1.21.6
     String REGISTRY_BLOCKS = "blocks";
 
     Tag<Material> ACACIA_LOGS = Bukkit.getTag(REGISTRY_BLOCKS, NamespacedKey.minecraft("acacia_logs"), Material.class);
diff --git a/paper-api/src/main/java/org/bukkit/block/Biome.java b/paper-api/src/main/java/org/bukkit/block/Biome.java
index d2efec3ec3a..3f88fb210bc 100644
--- a/paper-api/src/main/java/org/bukkit/block/Biome.java
+++ b/paper-api/src/main/java/org/bukkit/block/Biome.java
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull;
 public interface Biome extends OldEnum<Biome>, Keyed, net.kyori.adventure.translation.Translatable { // Paper - Adventure translations
 
     // Start generate - Biome
-    // @GeneratedFrom 1.21.6-rc1
+    // @GeneratedFrom 1.21.6
     Biome BADLANDS = getBiome("badlands");
 
     Biome BAMBOO_JUNGLE = getBiome("bamboo_jungle");
diff --git a/paper-api/src/main/java/org/bukkit/block/BlockType.java b/paper-api/src/main/java/org/bukkit/block/BlockType.java
index 88cf293c3e0..c12cc7a243b 100644
--- a/paper-api/src/main/java/org/bukkit/block/BlockType.java
+++ b/paper-api/src/main/java/org/bukkit/block/BlockType.java
@@ -198,7 +198,7 @@ public interface BlockType extends Keyed, Translatable, net.kyori.adventure.tran
 
     //<editor-fold desc="BlockTypes" defaultstate="collapsed">
     // Start generate - BlockType
-    // @GeneratedFrom 1.21.6-rc1
+    // @GeneratedFrom 1.21.6
     BlockType.Typed<Switch> ACACIA_BUTTON = getBlockType("acacia_button");
 
     BlockType.Typed<Door> ACACIA_DOOR = getBlockType("acacia_door");
diff --git a/paper-api/src/main/java/org/bukkit/block/banner/PatternType.java b/paper-api/src/main/java/org/bukkit/block/banner/PatternType.java
index 38a6a449c13..3261826bf4b 100644
--- a/paper-api/src/main/java/org/bukkit/block/banner/PatternType.java
+++ b/paper-api/src/main/java/org/bukkit/block/banner/PatternType.java
@@ -16,7 +16,7 @@ import org.jetbrains.annotations.Nullable;
 public interface PatternType extends OldEnum<PatternType>, Keyed {
 
     // Start generate - PatternType
-    // @GeneratedFrom 1.21.6-rc1
+    // @GeneratedFrom 1.21.6
     PatternType BASE = getType("base");
 
     PatternType BORDER = getType("border");
diff --git a/paper-api/src/main/java/org/bukkit/damage/DamageType.java b/paper-api/src/main/java/org/bukkit/damage/DamageType.java
index d31e1512b42..5a95be7310b 100644
--- a/paper-api/src/main/java/org/bukkit/damage/DamageType.java
+++ b/paper-api/src/main/java/org/bukkit/damage/DamageType.java
@@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull;
 public interface DamageType extends Keyed, Translatable {
 
     // Start generate - DamageType
-    // @GeneratedFrom 1.21.6-rc1
+    // @GeneratedFrom 1.21.6
     DamageType ARROW = getDamageType("arrow");
 
     DamageType BAD_RESPAWN_POINT = getDamageType("bad_respawn_point");
diff --git a/paper-api/src/main/java/org/bukkit/entity/Armadillo.java b/paper-api/src/main/java/org/bukkit/entity/Armadillo.java
index 92ae3daff75..8a21b42e7c1 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Armadillo.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Armadillo.java
@@ -30,7 +30,7 @@ public interface Armadillo extends Animals {
      */
     enum State {
         // Start generate - ArmadilloState
-        // @GeneratedFrom 1.21.6-rc1
+        // @GeneratedFrom 1.21.6
         IDLE,
         ROLLING,
         SCARED,
diff --git a/paper-api/src/main/java/org/bukkit/entity/Boat.java b/paper-api/src/main/java/org/bukkit/entity/Boat.java
index 0e4ce1dff10..aa65f9acab5 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Boat.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Boat.java
@@ -177,7 +177,7 @@ public interface Boat extends Vehicle, io.papermc.paper.entity.Leashable { // Pa
 
         NOT_IN_WORLD,
         // Start generate - BoatStatus
-        // @GeneratedFrom 1.21.6-rc1
+        // @GeneratedFrom 1.21.6
         IN_WATER,
         UNDER_WATER,
         UNDER_FLOWING_WATER,
diff --git a/paper-api/src/main/java/org/bukkit/entity/Cat.java b/paper-api/src/main/java/org/bukkit/entity/Cat.java
index 20dd548e5cf..d8a4bd1d17d 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Cat.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Cat.java
@@ -55,7 +55,7 @@ public interface Cat extends Tameable, Sittable, io.papermc.paper.entity.CollarC
     interface Type extends OldEnum<Type>, Keyed {
 
         // Start generate - CatType
-        // @GeneratedFrom 1.21.6-rc1
+        // @GeneratedFrom 1.21.6
         Type ALL_BLACK = getType("all_black");
 
         Type BLACK = getType("black");
diff --git a/paper-api/src/main/java/org/bukkit/entity/Chicken.java b/paper-api/src/main/java/org/bukkit/entity/Chicken.java
index 5f33149f6c8..ca5688e270a 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Chicken.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Chicken.java
@@ -60,7 +60,7 @@ public interface Chicken extends Animals {
     interface Variant extends Keyed {
 
         // Start generate - ChickenVariant
-        // @GeneratedFrom 1.21.6-rc1
+        // @GeneratedFrom 1.21.6
         Variant COLD = getVariant("cold");
 
         Variant TEMPERATE = getVariant("temperate");
diff --git a/paper-api/src/main/java/org/bukkit/entity/Cow.java b/paper-api/src/main/java/org/bukkit/entity/Cow.java
index 360512141c4..2631fffe2bc 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Cow.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Cow.java
@@ -32,7 +32,7 @@ public interface Cow extends AbstractCow {
     interface Variant extends Keyed {
 
         // Start generate - CowVariant
-        // @GeneratedFrom 1.21.6-rc1
+        // @GeneratedFrom 1.21.6
         Variant COLD = getVariant("cold");
 
         Variant TEMPERATE = getVariant("temperate");
diff --git a/paper-api/src/main/java/org/bukkit/entity/EntityType.java b/paper-api/src/main/java/org/bukkit/entity/EntityType.java
index 6a077d42ebb..819c108d094 100644
--- a/paper-api/src/main/java/org/bukkit/entity/EntityType.java
+++ b/paper-api/src/main/java/org/bukkit/entity/EntityType.java
@@ -46,7 +46,7 @@ import org.jetbrains.annotations.Nullable;
 public enum EntityType implements Keyed, Translatable, net.kyori.adventure.translation.Translatable, io.papermc.paper.world.flag.FeatureDependant { // Paper - translatable
 
     // Start generate - EntityType
-    // @GeneratedFrom 1.21.6-rc1
+    // @GeneratedFrom 1.21.6
     ACACIA_BOAT("acacia_boat", AcaciaBoat.class, -1),
     ACACIA_CHEST_BOAT("acacia_chest_boat", AcaciaChestBoat.class, -1),
     ALLAY("allay", Allay.class, -1),
diff --git a/paper-api/src/main/java/org/bukkit/entity/Fox.java b/paper-api/src/main/java/org/bukkit/entity/Fox.java
index 64e8ff4fb02..1d9c45a4f97 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Fox.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Fox.java
@@ -90,7 +90,7 @@ public interface Fox extends Animals, Sittable {
      */
     public enum Type {
         // Start generate - FoxType
-        // @GeneratedFrom 1.21.6-rc1
+        // @GeneratedFrom 1.21.6
         RED,
         SNOW;
         // End generate - FoxType
diff --git a/paper-api/src/main/java/org/bukkit/entity/Frog.java b/paper-api/src/main/java/org/bukkit/entity/Frog.java
index 808bc76b0b2..99678378dd0 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Frog.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Frog.java
@@ -53,7 +53,7 @@ public interface Frog extends Animals {
     interface Variant extends OldEnum<Variant>, Keyed {
 
         // Start generate - FrogVariant
-        // @GeneratedFrom 1.21.6-rc1
+        // @GeneratedFrom 1.21.6
         Variant COLD = getVariant("cold");
 
         Variant TEMPERATE = getVariant("temperate");
diff --git a/paper-api/src/main/java/org/bukkit/entity/Panda.java b/paper-api/src/main/java/org/bukkit/entity/Panda.java
index 1dbd7ca3563..dbc5efa08ae 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Panda.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Panda.java
@@ -186,7 +186,7 @@ public interface Panda extends Animals, Sittable {
     public enum Gene {
 
         // Start generate - PandaGene
-        // @GeneratedFrom 1.21.6-rc1
+        // @GeneratedFrom 1.21.6
         NORMAL(false),
         LAZY(false),
         WORRIED(false),
diff --git a/paper-api/src/main/java/org/bukkit/entity/Pig.java b/paper-api/src/main/java/org/bukkit/entity/Pig.java
index 9374c2e358a..efb2301c333 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Pig.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Pig.java
@@ -32,7 +32,7 @@ public interface Pig extends Steerable, Vehicle {
     interface Variant extends Keyed {
 
         // Start generate - PigVariant
-        // @GeneratedFrom 1.21.6-rc1
+        // @GeneratedFrom 1.21.6
         Variant COLD = getVariant("cold");
 
         Variant TEMPERATE = getVariant("temperate");
diff --git a/paper-api/src/main/java/org/bukkit/entity/Salmon.java b/paper-api/src/main/java/org/bukkit/entity/Salmon.java
index d882e50afef..6bb398ca63e 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Salmon.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Salmon.java
@@ -28,7 +28,7 @@ public interface Salmon extends io.papermc.paper.entity.SchoolableFish { // Pape
     public enum Variant {
 
         // Start generate - SalmonVariant
-        // @GeneratedFrom 1.21.6-rc1
+        // @GeneratedFrom 1.21.6
         SMALL,
         MEDIUM,
         LARGE;
diff --git a/paper-api/src/main/java/org/bukkit/entity/Sniffer.java b/paper-api/src/main/java/org/bukkit/entity/Sniffer.java
index 3b1fe9f6aad..5fba79294ca 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Sniffer.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Sniffer.java
@@ -75,7 +75,7 @@ public interface Sniffer extends Animals {
      */
     public enum State {
         // Start generate - SnifferState
-        // @GeneratedFrom 1.21.6-rc1
+        // @GeneratedFrom 1.21.6
         IDLING,
         FEELING_HAPPY,
         SCENTING,
diff --git a/paper-api/src/main/java/org/bukkit/entity/TropicalFish.java b/paper-api/src/main/java/org/bukkit/entity/TropicalFish.java
index 6538fc1e73c..ca64bbef8f0 100644
--- a/paper-api/src/main/java/org/bukkit/entity/TropicalFish.java
+++ b/paper-api/src/main/java/org/bukkit/entity/TropicalFish.java
@@ -61,7 +61,7 @@ public interface TropicalFish extends io.papermc.paper.entity.SchoolableFish { /
     public static enum Pattern {
 
         // Start generate - TropicalFishPattern
-        // @GeneratedFrom 1.21.6-rc1
+        // @GeneratedFrom 1.21.6
         KOB,
         SUNSTREAK,
         SNOOPER,
diff --git a/paper-api/src/main/java/org/bukkit/entity/Villager.java b/paper-api/src/main/java/org/bukkit/entity/Villager.java
index c3d37131fbd..1be07639143 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Villager.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Villager.java
@@ -172,7 +172,7 @@ public interface Villager extends AbstractVillager {
     interface Type extends OldEnum<Type>, Keyed {
 
         // Start generate - VillagerType
-        // @GeneratedFrom 1.21.6-rc1
+        // @GeneratedFrom 1.21.6
         Type DESERT = getType("desert");
 
         Type JUNGLE = getType("jungle");
@@ -224,7 +224,7 @@ public interface Villager extends AbstractVillager {
     interface Profession extends OldEnum<Profession>, Keyed, net.kyori.adventure.translation.Translatable {
 
         // Start generate - VillagerProfession
-        // @GeneratedFrom 1.21.6-rc1
+        // @GeneratedFrom 1.21.6
         /**
          * Armorer profession. Wears a black apron. Armorers primarily trade for
          * iron armor, chainmail armor, and sometimes diamond armor.
diff --git a/paper-api/src/main/java/org/bukkit/entity/Wolf.java b/paper-api/src/main/java/org/bukkit/entity/Wolf.java
index 693bc63cb9a..d0a64457e4b 100644
--- a/paper-api/src/main/java/org/bukkit/entity/Wolf.java
+++ b/paper-api/src/main/java/org/bukkit/entity/Wolf.java
@@ -142,7 +142,7 @@ public interface Wolf extends Tameable, Sittable, io.papermc.paper.entity.Collar
     interface SoundVariant extends Keyed {
 
         // Start generate - WolfSoundVariant
-        // @GeneratedFrom 1.21.6-rc1
+        // @GeneratedFrom 1.21.6
         SoundVariant ANGRY = getSoundVariant("angry");
 
         SoundVariant BIG = getSoundVariant("big");
diff --git a/paper-api/src/main/java/org/bukkit/entity/memory/MemoryKey.java b/paper-api/src/main/java/org/bukkit/entity/memory/MemoryKey.java
index fafc1647dcc..3f98b317267 100644
--- a/paper-api/src/main/java/org/bukkit/entity/memory/MemoryKey.java
+++ b/paper-api/src/main/java/org/bukkit/entity/memory/MemoryKey.java
@@ -47,7 +47,7 @@ public final class MemoryKey<T> implements Keyed {
     private static final Map<NamespacedKey, MemoryKey<?>> MEMORY_KEYS = new HashMap<>();
 
     // Start generate - MemoryKey
-    // @GeneratedFrom 1.21.6-rc1
+    // @GeneratedFrom 1.21.6
     public static final MemoryKey<Boolean> ADMIRING_DISABLED = new MemoryKey<>(NamespacedKey.minecraft("admiring_disabled"), Boolean.class);
 
     public static final MemoryKey<Boolean> ADMIRING_ITEM = new MemoryKey<>(NamespacedKey.minecraft("admiring_item"), Boolean.class);
diff --git a/paper-api/src/main/java/org/bukkit/generator/structure/Structure.java b/paper-api/src/main/java/org/bukkit/generator/structure/Structure.java
index be3fa8c1f20..e7404d7b656 100644
--- a/paper-api/src/main/java/org/bukkit/generator/structure/Structure.java
+++ b/paper-api/src/main/java/org/bukkit/generator/structure/Structure.java
@@ -17,7 +17,7 @@ import org.jetbrains.annotations.NotNull;
 public abstract class Structure implements Keyed {
 
     // Start generate - Structure
-    // @GeneratedFrom 1.21.6-rc1
+    // @GeneratedFrom 1.21.6
     public static final Structure ANCIENT_CITY = getStructure("ancient_city");
 
     public static final Structure BASTION_REMNANT = getStructure("bastion_remnant");
diff --git a/paper-api/src/main/java/org/bukkit/generator/structure/StructureType.java b/paper-api/src/main/java/org/bukkit/generator/structure/StructureType.java
index 8f0bd2950f2..4092aca8a1a 100644
--- a/paper-api/src/main/java/org/bukkit/generator/structure/StructureType.java
+++ b/paper-api/src/main/java/org/bukkit/generator/structure/StructureType.java
@@ -16,7 +16,7 @@ import org.jetbrains.annotations.NotNull;
 public abstract class StructureType implements Keyed {
 
     // Start generate - StructureType
-    // @GeneratedFrom 1.21.6-rc1
+    // @GeneratedFrom 1.21.6
     public static final StructureType BURIED_TREASURE = getStructureType("buried_treasure");
 
     public static final StructureType DESERT_PYRAMID = getStructureType("desert_pyramid");
diff --git a/paper-api/src/main/java/org/bukkit/inventory/ItemRarity.java b/paper-api/src/main/java/org/bukkit/inventory/ItemRarity.java
index 560470bfb91..b6cd7c4f59b 100644
--- a/paper-api/src/main/java/org/bukkit/inventory/ItemRarity.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/ItemRarity.java
@@ -10,7 +10,7 @@ import net.kyori.adventure.text.format.TextColor;
 public enum ItemRarity {
 
     // Start generate - ItemRarity
-    // @GeneratedFrom 1.21.6-rc1
+    // @GeneratedFrom 1.21.6
     COMMON(NamedTextColor.WHITE),
     UNCOMMON(NamedTextColor.YELLOW),
     RARE(NamedTextColor.AQUA),
diff --git a/paper-api/src/main/java/org/bukkit/inventory/meta/trim/TrimMaterial.java b/paper-api/src/main/java/org/bukkit/inventory/meta/trim/TrimMaterial.java
index edc9e34cc7c..9ff9228cb61 100644
--- a/paper-api/src/main/java/org/bukkit/inventory/meta/trim/TrimMaterial.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/trim/TrimMaterial.java
@@ -15,7 +15,7 @@ import org.jetbrains.annotations.NotNull;
 public interface TrimMaterial extends Keyed, Translatable {
 
     // Start generate - TrimMaterial
-    // @GeneratedFrom 1.21.6-rc1
+    // @GeneratedFrom 1.21.6
     TrimMaterial AMETHYST = getTrimMaterial("amethyst");
 
     TrimMaterial COPPER = getTrimMaterial("copper");
diff --git a/paper-api/src/main/java/org/bukkit/inventory/meta/trim/TrimPattern.java b/paper-api/src/main/java/org/bukkit/inventory/meta/trim/TrimPattern.java
index 27e57da1fe7..d035b14c428 100644
--- a/paper-api/src/main/java/org/bukkit/inventory/meta/trim/TrimPattern.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/meta/trim/TrimPattern.java
@@ -15,7 +15,7 @@ import org.jetbrains.annotations.NotNull;
 public interface TrimPattern extends Keyed, Translatable {
 
     // Start generate - TrimPattern
-    // @GeneratedFrom 1.21.6-rc1
+    // @GeneratedFrom 1.21.6
     TrimPattern BOLT = getTrimPattern("bolt");
 
     TrimPattern COAST = getTrimPattern("coast");
diff --git a/paper-api/src/main/java/org/bukkit/inventory/recipe/CookingBookCategory.java b/paper-api/src/main/java/org/bukkit/inventory/recipe/CookingBookCategory.java
index 10c28d2dd93..01821f5e624 100644
--- a/paper-api/src/main/java/org/bukkit/inventory/recipe/CookingBookCategory.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/recipe/CookingBookCategory.java
@@ -6,7 +6,7 @@ package org.bukkit.inventory.recipe;
 public enum CookingBookCategory {
 
     // Start generate - CookingBookCategory
-    // @GeneratedFrom 1.21.6-rc1
+    // @GeneratedFrom 1.21.6
     FOOD,
     BLOCKS,
     MISC;
diff --git a/paper-api/src/main/java/org/bukkit/inventory/recipe/CraftingBookCategory.java b/paper-api/src/main/java/org/bukkit/inventory/recipe/CraftingBookCategory.java
index 8ba51a57b99..3db79650efb 100644
--- a/paper-api/src/main/java/org/bukkit/inventory/recipe/CraftingBookCategory.java
+++ b/paper-api/src/main/java/org/bukkit/inventory/recipe/CraftingBookCategory.java
@@ -6,7 +6,7 @@ package org.bukkit.inventory.recipe;
 public enum CraftingBookCategory {
 
     // Start generate - CraftingBookCategory
-    // @GeneratedFrom 1.21.6-rc1
+    // @GeneratedFrom 1.21.6
     BUILDING,
     REDSTONE,
     EQUIPMENT,
diff --git a/paper-api/src/main/java/org/bukkit/map/MapCursor.java b/paper-api/src/main/java/org/bukkit/map/MapCursor.java
index f1ea5e0262e..eb22af794cd 100644
--- a/paper-api/src/main/java/org/bukkit/map/MapCursor.java
+++ b/paper-api/src/main/java/org/bukkit/map/MapCursor.java
@@ -289,7 +289,7 @@ public final class MapCursor {
     public interface Type extends OldEnum<Type>, Keyed {
 
         // Start generate - MapCursorType
-        // @GeneratedFrom 1.21.6-rc1
+        // @GeneratedFrom 1.21.6
         Type BANNER_BLACK = getType("banner_black");
 
         Type BANNER_BLUE = getType("banner_blue");
diff --git a/paper-api/src/main/java/org/bukkit/map/MapPalette.java b/paper-api/src/main/java/org/bukkit/map/MapPalette.java
index 5bb3267f81a..fd6f3bce50a 100644
--- a/paper-api/src/main/java/org/bukkit/map/MapPalette.java
+++ b/paper-api/src/main/java/org/bukkit/map/MapPalette.java
@@ -37,7 +37,7 @@ public final class MapPalette {
     @NotNull
     static final Color[] colors = {
         // Start generate - MapPalette#colors
-        // @GeneratedFrom 1.21.6-rc1
+        // @GeneratedFrom 1.21.6
         new Color(0x00000000, true),
         new Color(0x00000000, true),
         new Color(0x00000000, true),
diff --git a/paper-api/src/main/java/org/bukkit/potion/PotionType.java b/paper-api/src/main/java/org/bukkit/potion/PotionType.java
index 9ec61eb965f..3f9d5cc4e92 100644
--- a/paper-api/src/main/java/org/bukkit/potion/PotionType.java
+++ b/paper-api/src/main/java/org/bukkit/potion/PotionType.java
@@ -16,7 +16,7 @@ import org.jetbrains.annotations.Nullable;
  */
 public enum PotionType implements Keyed, io.papermc.paper.world.flag.FeatureDependant { // Paper - feature flag API
     // Start generate - PotionType
-    // @GeneratedFrom 1.21.6-rc1
+    // @GeneratedFrom 1.21.6
     AWKWARD("awkward"),
     FIRE_RESISTANCE("fire_resistance"),
     HARMING("harming"),
diff --git a/paper-api/src/main/java/org/bukkit/scoreboard/DisplaySlot.java b/paper-api/src/main/java/org/bukkit/scoreboard/DisplaySlot.java
index ed6fd693457..b96d5f2348a 100644
--- a/paper-api/src/main/java/org/bukkit/scoreboard/DisplaySlot.java
+++ b/paper-api/src/main/java/org/bukkit/scoreboard/DisplaySlot.java
@@ -8,7 +8,7 @@ import org.jspecify.annotations.NullMarked;
 @NullMarked
 public enum DisplaySlot {
     // Start generate - DisplaySlot
-    // @GeneratedFrom 1.21.6-rc1
+    // @GeneratedFrom 1.21.6
     PLAYER_LIST("list"),
     SIDEBAR("sidebar"),
     BELOW_NAME("below_name"),
diff --git a/paper-api/src/main/java/org/bukkit/tag/DamageTypeTags.java b/paper-api/src/main/java/org/bukkit/tag/DamageTypeTags.java
index daac566f77e..d22f1d620f6 100644
--- a/paper-api/src/main/java/org/bukkit/tag/DamageTypeTags.java
+++ b/paper-api/src/main/java/org/bukkit/tag/DamageTypeTags.java
@@ -14,7 +14,7 @@ import org.jetbrains.annotations.Nullable;
 public final class DamageTypeTags {
 
     // Start generate - DamageTypeTags
-    // @GeneratedFrom 1.21.6-rc1
+    // @GeneratedFrom 1.21.6
     public static final Tag<DamageType> ALWAYS_HURTS_ENDER_DRAGONS = getTag("always_hurts_ender_dragons");
 
     public static final Tag<DamageType> ALWAYS_KILLS_ARMOR_STANDS = getTag("always_kills_armor_stands");
diff --git a/paper-server/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/paper-server/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
index 9e32cbb2664..94bf04bb1c6 100644
--- a/paper-server/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
+++ b/paper-server/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
@@ -27,7 +27,7 @@ public class MobGoalHelper {
     public static final Map<Class<? extends net.minecraft.world.entity.Mob>, Class<? extends Mob>> BUKKIT_BRIDGE = Util.make(new LinkedHashMap<>(), map -> {
         //<editor-fold defaultstate="collapsed" desc="bukkitMap Entities">
         // Start generate - MobGoalHelper#BUKKIT_BRIDGE
-        // @GeneratedFrom 1.21.6-rc1
+        // @GeneratedFrom 1.21.6
         map.put(net.minecraft.world.entity.Mob.class, Mob.class);
         map.put(net.minecraft.world.entity.AgeableMob.class, Ageable.class);
         map.put(net.minecraft.world.entity.ambient.AmbientCreature.class, Ambient.class);
diff --git a/paper-server/src/main/java/io/papermc/paper/registry/PaperRegistries.java b/paper-server/src/main/java/io/papermc/paper/registry/PaperRegistries.java
index a45afdefed8..cb19bb1701e 100644
--- a/paper-server/src/main/java/io/papermc/paper/registry/PaperRegistries.java
+++ b/paper-server/src/main/java/io/papermc/paper/registry/PaperRegistries.java
@@ -97,7 +97,7 @@ public final class PaperRegistries {
     static {
         REGISTRY_ENTRIES = List.of(
             // Start generate - RegistryDefinitions
-            // @GeneratedFrom 1.21.6-rc1
+            // @GeneratedFrom 1.21.6
             // built-in
             start(Registries.GAME_EVENT, RegistryKey.GAME_EVENT).craft(GameEvent.class, CraftGameEvent::new).writable(PaperGameEventRegistryEntry.PaperBuilder::new),
             start(Registries.STRUCTURE_TYPE, RegistryKey.STRUCTURE_TYPE).craft(StructureType.class, CraftStructureType::new).build(),
diff --git a/paper-server/src/main/java/io/papermc/paper/world/flag/PaperFeatureFlagProviderImpl.java b/paper-server/src/main/java/io/papermc/paper/world/flag/PaperFeatureFlagProviderImpl.java
index 2de9d79441e..a7e3f55a92b 100644
--- a/paper-server/src/main/java/io/papermc/paper/world/flag/PaperFeatureFlagProviderImpl.java
+++ b/paper-server/src/main/java/io/papermc/paper/world/flag/PaperFeatureFlagProviderImpl.java
@@ -21,7 +21,7 @@ public class PaperFeatureFlagProviderImpl implements FeatureFlagProvider {
 
     public static final BiMap<FeatureFlag, net.minecraft.world.flag.FeatureFlag> FLAGS = ImmutableBiMap.of(
         // Start generate - PaperFeatureFlagProviderImpl#FLAGS
-        // @GeneratedFrom 1.21.6-rc1
+        // @GeneratedFrom 1.21.6
         FeatureFlag.MINECART_IMPROVEMENTS, FeatureFlags.MINECART_IMPROVEMENTS,
         FeatureFlag.REDSTONE_EXPERIMENTS, FeatureFlags.REDSTONE_EXPERIMENTS,
         FeatureFlag.TRADE_REBALANCE, FeatureFlags.TRADE_REBALANCE,
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftStatistic.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftStatistic.java
index e5612f8ccc2..0d530e1b292 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftStatistic.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftStatistic.java
@@ -21,7 +21,7 @@ import org.bukkit.entity.EntityType;
 
 public enum CraftStatistic {
     // Start generate - CraftStatisticCustom
-    // @GeneratedFrom 1.21.6-rc1
+    // @GeneratedFrom 1.21.6
     ANIMALS_BRED(Stats.ANIMALS_BRED),
     AVIATE_ONE_CM(Stats.AVIATE_ONE_CM),
     BELL_RING(Stats.BELL_RING),
@@ -100,7 +100,7 @@ public enum CraftStatistic {
     WALK_UNDER_WATER_ONE_CM(Stats.WALK_UNDER_WATER_ONE_CM),
     // End generate - CraftStatisticCustom
     // Start generate - CraftStatisticType
-    // @GeneratedFrom 1.21.6-rc1
+    // @GeneratedFrom 1.21.6
     BREAK_ITEM(ResourceLocation.withDefaultNamespace("broken")),
     CRAFT_ITEM(ResourceLocation.withDefaultNamespace("crafted")),
     DROP(ResourceLocation.withDefaultNamespace("dropped")),
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java
index cc5028cebcd..63f6b5d00b4 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java
@@ -85,7 +85,7 @@ public final class CraftBlockStates {
 
     static {
         // Start generate - CraftBlockEntityStates
-        // @GeneratedFrom 1.21.6-rc1
+        // @GeneratedFrom 1.21.6
         register(BlockEntityType.BANNER, CraftBanner.class, CraftBanner::new);
         register(BlockEntityType.BARREL, CraftBarrel.class, CraftBarrel::new);
         register(BlockEntityType.BEACON, CraftBeacon.class, CraftBeacon::new);
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
index 6ea7d087acd..ae9c9a96ac0 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
@@ -362,7 +362,7 @@ public class CraftBlockData implements BlockData {
     static {
         //<editor-fold desc="CraftBlockData Registration" defaultstate="collapsed">
         // Start generate - CraftBlockData#MAP
-        // @GeneratedFrom 1.21.6-rc1
+        // @GeneratedFrom 1.21.6
         register(net.minecraft.world.level.block.AmethystClusterBlock.class, org.bukkit.craftbukkit.block.impl.CraftAmethystCluster::new);
         register(net.minecraft.world.level.block.AnvilBlock.class, org.bukkit.craftbukkit.block.impl.CraftAnvil::new);
         register(net.minecraft.world.level.block.AttachedStemBlock.class, org.bukkit.craftbukkit.block.impl.CraftAttachedStem::new);
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java b/paper-server/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java
index 1522c8fdb77..7d663964d4d 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java
@@ -15,7 +15,7 @@ public class CraftPotionUtil {
 
     private static final BiMap<PotionType, PotionType> upgradeable = ImmutableBiMap.<PotionType, PotionType>builder()
             // Start generate - CraftPotionUtil#upgradeable
-            // @GeneratedFrom 1.21.6-rc1
+            // @GeneratedFrom 1.21.6
             .put(PotionType.HARMING, PotionType.STRONG_HARMING)
             .put(PotionType.HEALING, PotionType.STRONG_HEALING)
             .put(PotionType.LEAPING, PotionType.STRONG_LEAPING)
@@ -29,7 +29,7 @@ public class CraftPotionUtil {
             .build();
     private static final BiMap<PotionType, PotionType> extendable = ImmutableBiMap.<PotionType, PotionType>builder()
             // Start generate - CraftPotionUtil#extendable
-            // @GeneratedFrom 1.21.6-rc1
+            // @GeneratedFrom 1.21.6
             .put(PotionType.FIRE_RESISTANCE, PotionType.LONG_FIRE_RESISTANCE)
             .put(PotionType.INVISIBILITY, PotionType.LONG_INVISIBILITY)
             .put(PotionType.LEAPING, PotionType.LONG_LEAPING)