diff --git a/patches/api/Add-Ban-Methods-to-Player-Objects.patch b/patches/api/Add-Ban-Methods-to-Player-Objects.patch
index 08247772e0..1246b8b15e 100644
--- a/patches/api/Add-Ban-Methods-to-Player-Objects.patch
+++ b/patches/api/Add-Ban-Methods-to-Player-Objects.patch
@@ -24,7 +24,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated use {@link #ban(String, Date, String)}
 +     */
 +    @NotNull
-+    @Deprecated
++    @Deprecated(since = "1.20.4")
 +    public default BanEntry banPlayer(@Nullable String reason) {
 +        return banPlayer(reason, null, null);
 +    }
@@ -37,7 +37,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated use {@link #ban(String, Date, String)}
 +     */
 +    @NotNull
-+    @Deprecated
++    @Deprecated(since = "1.20.4")
 +    public default BanEntry banPlayer(@Nullable String reason, @Nullable String source) {
 +        return banPlayer(reason, null, source);
 +    }
@@ -50,7 +50,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated use {@link #ban(String, Date, String)}
 +     */
 +    @NotNull
-+    @Deprecated
++    @Deprecated(since = "1.20.4")
 +    public default BanEntry banPlayer(@Nullable String reason, @Nullable java.util.Date expires) {
 +        return banPlayer(reason, expires, null);
 +    }
@@ -64,7 +64,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated use {@link #ban(String, Date, String)}
 +     */
 +    @NotNull
-+    @Deprecated
++    @Deprecated(since = "1.20.4")
 +    public default BanEntry banPlayer(@Nullable String reason, @Nullable java.util.Date expires, @Nullable String source) {
 +        return banPlayer(reason, expires, source, true);
 +    }
@@ -73,7 +73,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated use {@link #ban(String, Date, String)}
 +     */
 +    @NotNull
-+    @Deprecated
++    @Deprecated(since = "1.20.4")
 +    public default BanEntry banPlayer(@Nullable String reason, @Nullable java.util.Date expires, @Nullable String source, boolean kickIfOnline) {
 +        BanEntry banEntry = Bukkit.getServer().getBanList(BanList.Type.NAME).addBan(getName(), reason, expires, source);
 +        if (kickIfOnline && isOnline()) {
@@ -102,7 +102,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     */
 +    // For reference, Bukkit defines this as nullable, while they impl isn't, we'll follow API.
 +    @Nullable
-+    @Deprecated
++    @Deprecated(since = "1.20.4")
 +    public default org.bukkit.BanEntry banPlayerFull(@Nullable String reason) {
 +        return banPlayerFull(reason, null, null);
 +    }
@@ -116,7 +116,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated use {@link #ban(String, Date, String)} and {@link #banIp(String, Date, String, boolean)}
 +     */
 +    @Nullable
-+    @Deprecated
++    @Deprecated(since = "1.20.4")
 +    public default org.bukkit.BanEntry banPlayerFull(@Nullable String reason, @Nullable String source) {
 +        return banPlayerFull(reason, null, source);
 +    }
@@ -130,7 +130,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated use {@link #ban(String, Date, String)} and {@link #banIp(String, Date, String, boolean)}
 +     */
 +    @Nullable
-+    @Deprecated
++    @Deprecated(since = "1.20.4")
 +    public default org.bukkit.BanEntry banPlayerFull(@Nullable String reason, @Nullable java.util.Date expires) {
 +        return banPlayerFull(reason, expires, null);
 +    }
@@ -145,7 +145,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated use {@link #ban(String, Date, String)} and {@link #banIp(String, Date, String, boolean)}
 +     */
 +    @Nullable
-+    @Deprecated
++    @Deprecated(since = "1.20.4")
 +    public default org.bukkit.BanEntry banPlayerFull(@Nullable String reason, @Nullable java.util.Date expires, @Nullable String source) {
 +        banPlayer(reason, expires, source);
 +        return banPlayerIP(reason, expires, source, true);
@@ -161,7 +161,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated use {@link #ban(String, Date, String)} and {@link #banIp(String, Date, String, boolean)}
 +     */
 +    @Nullable
-+    @Deprecated
++    @Deprecated(since = "1.20.4")
 +    public default org.bukkit.BanEntry banPlayerIP(@Nullable String reason, boolean kickPlayer) {
 +        return banPlayerIP(reason, null, null, kickPlayer);
 +    }
@@ -176,7 +176,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated use {@link #ban(String, Date, String)} and {@link #banIp(String, Date, String, boolean)}
 +     */
 +    @Nullable
-+    @Deprecated
++    @Deprecated(since = "1.20.4")
 +    public default org.bukkit.BanEntry banPlayerIP(@Nullable String reason, @Nullable String source, boolean kickPlayer) {
 +        return banPlayerIP(reason, null, source, kickPlayer);
 +    }
@@ -191,7 +191,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated use {@link #ban(String, Date, String)} and {@link #banIp(String, Date, String, boolean)}
 +     */
 +    @Nullable
-+    @Deprecated
++    @Deprecated(since = "1.20.4")
 +    public default org.bukkit.BanEntry banPlayerIP(@Nullable String reason, @Nullable java.util.Date expires, boolean kickPlayer) {
 +        return banPlayerIP(reason, expires, null, kickPlayer);
 +    }
@@ -205,7 +205,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated use {@link #ban(String, Date, String)} and {@link #banIp(String, Date, String, boolean)}
 +     */
 +    @Nullable
-+    @Deprecated
++    @Deprecated(since = "1.20.4")
 +    public default org.bukkit.BanEntry banPlayerIP(@Nullable String reason) {
 +        return banPlayerIP(reason, null, null);
 +    }
@@ -219,7 +219,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated use {@link #ban(String, Date, String)} and {@link #banIp(String, Date, String, boolean)}
 +     */
 +    @Nullable
-+    @Deprecated
++    @Deprecated(since = "1.20.4")
 +    public default org.bukkit.BanEntry banPlayerIP(@Nullable String reason, @Nullable String source) {
 +        return banPlayerIP(reason, null, source);
 +    }
@@ -233,7 +233,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated use {@link #ban(String, Date, String)} and {@link #banIp(String, Date, String, boolean)}
 +     */
 +    @Nullable
-+    @Deprecated
++    @Deprecated(since = "1.20.4")
 +    public default org.bukkit.BanEntry banPlayerIP(@Nullable String reason, @Nullable java.util.Date expires) {
 +        return banPlayerIP(reason, expires, null);
 +    }
@@ -248,7 +248,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated use {@link #ban(String, Date, String)} and {@link #banIp(String, Date, String, boolean)}
 +     */
 +    @Nullable
-+    @Deprecated
++    @Deprecated(since = "1.20.4")
 +    public default org.bukkit.BanEntry banPlayerIP(@Nullable String reason, @Nullable java.util.Date expires, @Nullable String source) {
 +        return banPlayerIP(reason, expires, source, true);
 +    }
@@ -264,7 +264,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated use {@link #ban(String, Date, String)} and {@link #banIp(String, Date, String, boolean)}
 +     */
 +    @Nullable
-+    @Deprecated
++    @Deprecated(since = "1.20.4")
 +    public default org.bukkit.BanEntry banPlayerIP(@Nullable String reason, @Nullable java.util.Date expires, @Nullable String source, boolean kickPlayer) {
 +        org.bukkit.BanEntry banEntry = org.bukkit.Bukkit.getServer().getBanList(org.bukkit.BanList.Type.IP).addBan(getAddress().getAddress().getHostAddress(), reason, expires, source);
 +        if (kickPlayer && isOnline()) {
diff --git a/patches/api/Add-BellRevealRaiderEvent.patch b/patches/api/Add-BellRevealRaiderEvent.patch
index 293b9fbc38..96a60a09ca 100644
--- a/patches/api/Add-BellRevealRaiderEvent.patch
+++ b/patches/api/Add-BellRevealRaiderEvent.patch
@@ -25,7 +25,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 + *
 + * @deprecated use {@link org.bukkit.event.block.BellResonateEvent}
 + */
-+@Deprecated
++@Deprecated(since = "1.19.4")
 +public class BellRevealRaiderEvent extends BlockEvent implements Cancellable {
 +
 +    private static final HandlerList HANDLER_LIST = new HandlerList();
diff --git a/patches/api/Add-BellRingEvent.patch b/patches/api/Add-BellRingEvent.patch
index 2871cb8d6a..5c2ab07644 100644
--- a/patches/api/Add-BellRingEvent.patch
+++ b/patches/api/Add-BellRingEvent.patch
@@ -26,7 +26,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 + *
 + * @deprecated use {@link org.bukkit.event.block.BellRingEvent}
 + */
-+@Deprecated
++@Deprecated(since = "1.19.4")
 +public class BellRingEvent extends org.bukkit.event.block.BellRingEvent {
 +
 +    @ApiStatus.Internal
diff --git a/patches/api/Add-BlockSoundGroup-interface.patch b/patches/api/Add-BlockSoundGroup-interface.patch
index b3f68520dc..b5a20d47cd 100644
--- a/patches/api/Add-BlockSoundGroup-interface.patch
+++ b/patches/api/Add-BlockSoundGroup-interface.patch
@@ -23,7 +23,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 + * The sound group includes break, step, place, hit, and fall sounds.
 + * @deprecated use {@link org.bukkit.SoundGroup}
 + */
-+@Deprecated(forRemoval = true)
++@Deprecated(forRemoval = true, since = "1.18.2")
 +public interface BlockSoundGroup {
 +    /**
 +     * Gets the sound that plays when breaking this block
@@ -32,7 +32,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated use {@link org.bukkit.SoundGroup#getBreakSound()}
 +     */
 +    @NotNull
-+    @Deprecated(forRemoval = true)
++    @Deprecated(forRemoval = true, since = "1.18.2")
 +    Sound getBreakSound();
 +
 +    /**
@@ -42,7 +42,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated use {@link org.bukkit.SoundGroup#getStepSound()}
 +     */
 +    @NotNull
-+    @Deprecated(forRemoval = true)
++    @Deprecated(forRemoval = true, since = "1.18.2")
 +    Sound getStepSound();
 +
 +    /**
@@ -52,7 +52,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated use {@link org.bukkit.SoundGroup#getPlaceSound()}
 +     */
 +    @NotNull
-+    @Deprecated(forRemoval = true)
++    @Deprecated(forRemoval = true, since = "1.18.2")
 +    Sound getPlaceSound();
 +
 +    /**
@@ -62,7 +62,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated use {@link org.bukkit.SoundGroup#getHitSound()}
 +     */
 +    @NotNull
-+    @Deprecated(forRemoval = true)
++    @Deprecated(forRemoval = true, since = "1.18.2")
 +    Sound getHitSound();
 +
 +    /**
@@ -72,7 +72,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated use {@link org.bukkit.SoundGroup#getFallSound()}
 +     */
 +    @NotNull
-+    @Deprecated(forRemoval = true)
++    @Deprecated(forRemoval = true, since = "1.18.2")
 +    Sound getFallSound();
 +}
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
@@ -94,7 +94,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated use {@link #getBlockSoundGroup()}
 +     */
 +    @NotNull
-+    @Deprecated(forRemoval = true)
++    @Deprecated(forRemoval = true, since = "1.18.2")
 +    com.destroystokyo.paper.block.BlockSoundGroup getSoundGroup();
 +
 +    /**
diff --git a/patches/api/Add-LivingEntity-getTargetEntity.patch b/patches/api/Add-LivingEntity-getTargetEntity.patch
index 437892a4a6..2adac4dc02 100644
--- a/patches/api/Add-LivingEntity-getTargetEntity.patch
+++ b/patches/api/Add-LivingEntity-getTargetEntity.patch
@@ -20,7 +20,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 + * Represents information about a targeted entity
 + * @deprecated use {@link org.bukkit.util.RayTraceResult}
 + */
-+@Deprecated(forRemoval = true)
++@Deprecated(forRemoval = true, since = "1.19.3")
 +public class TargetEntityInfo {
 +    private final Entity entity;
 +    private final Vector hitVec;
@@ -55,7 +55,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -0,0 +0,0 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
-     @Deprecated(forRemoval = true)
+     @Deprecated(forRemoval = true, since = "1.19.3")
      @Nullable
      public com.destroystokyo.paper.block.TargetBlockInfo getTargetBlockInfo(int maxDistance, @NotNull com.destroystokyo.paper.block.TargetBlockInfo.FluidMode fluidMode);
 +
@@ -88,7 +88,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     *     or null if no entity is targeted
 +     * @deprecated use {@link #rayTraceEntities(int)}
 +     */
-+    @Deprecated(forRemoval = true)
++    @Deprecated(forRemoval = true, since = "1.19.3")
 +    @Nullable
 +    public default com.destroystokyo.paper.entity.TargetEntityInfo getTargetEntityInfo(int maxDistance) {
 +        return getTargetEntityInfo(maxDistance, false);
@@ -115,7 +115,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     *     or null if no entity is targeted
 +     * @deprecated use {@link #rayTraceEntities(int, boolean)}
 +     */
-+    @Deprecated(forRemoval = true)
++    @Deprecated(forRemoval = true, since = "1.19.3")
 +    @Nullable
 +    public com.destroystokyo.paper.entity.TargetEntityInfo getTargetEntityInfo(int maxDistance, boolean ignoreBlocks);
 +
diff --git a/patches/api/Add-PrepareResultEvent-PrepareGrindstoneEvent.patch b/patches/api/Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
index 5314547b93..968e84f638 100644
--- a/patches/api/Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
+++ b/patches/api/Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
@@ -30,7 +30,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 + *
 + * @deprecated use {@link org.bukkit.event.inventory.PrepareGrindstoneEvent}
 + */
-+@Deprecated
++@Deprecated(since = "1.16.1")
 +@Warning
 +public class PrepareGrindstoneEvent extends PrepareResultEvent {
 +
diff --git a/patches/api/Add-ProjectileCollideEvent.patch b/patches/api/Add-ProjectileCollideEvent.patch
index d91b3e8cdd..0b9f8b7ca9 100644
--- a/patches/api/Add-ProjectileCollideEvent.patch
+++ b/patches/api/Add-ProjectileCollideEvent.patch
@@ -29,7 +29,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 + *
 + * @deprecated Deprecated, use {@link org.bukkit.event.entity.ProjectileHitEvent} and check if there is a hit entity
 + */
-+@Deprecated
++@Deprecated(since = "1.19.3")
 +public class ProjectileCollideEvent extends EntityEvent implements Cancellable {
 +
 +    private static final HandlerList HANDLER_LIST = new HandlerList();
diff --git a/patches/api/Add-TNTPrimeEvent.patch b/patches/api/Add-TNTPrimeEvent.patch
index d94c20271f..105dd77404 100644
--- a/patches/api/Add-TNTPrimeEvent.patch
+++ b/patches/api/Add-TNTPrimeEvent.patch
@@ -34,7 +34,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 + * @author Mark Vainomaa
 + * @deprecated use {@link org.bukkit.event.block.TNTPrimeEvent}
 + */
-+@Deprecated(forRemoval = true)
++@Deprecated(forRemoval = true, since = "1.19.4")
 +public class TNTPrimeEvent extends BlockEvent implements Cancellable {
 +
 +    private static final HandlerList HANDLER_LIST = new HandlerList();
diff --git a/patches/api/Add-WaterBottleSplashEvent.patch b/patches/api/Add-WaterBottleSplashEvent.patch
index b628e95522..6c2b8843d7 100644
--- a/patches/api/Add-WaterBottleSplashEvent.patch
+++ b/patches/api/Add-WaterBottleSplashEvent.patch
@@ -116,7 +116,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @return a confusing collection, don't use it
 +     * @deprecated Use {@link #getToDamage()}
 +     */
-+    @Deprecated
++    @Deprecated(since = "1.19.3")
 +    @Override
 +    public @NotNull Collection<LivingEntity> getAffectedEntities() {
 +        return super.getAffectedEntities();
@@ -128,7 +128,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @return a confusing value
 +     * @deprecated check if {@link #getToDamage()} contains an entity
 +     */
-+    @Deprecated
++    @Deprecated(since = "1.19.3")
 +    @Override
 +    public double getIntensity(final @NotNull LivingEntity entity) {
 +        return super.getIntensity(entity);
@@ -141,7 +141,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * or {@link #doNotDamageAsWaterSensitive(LivingEntity)} to change which entities are
 +     * damaged
 +     */
-+    @Deprecated
++    @Deprecated(since = "1.19.3")
 +    @Override
 +    public void setIntensity(final @NotNull LivingEntity entity, final double intensity) {
 +        super.setIntensity(entity, intensity);
diff --git a/patches/api/Add-enchantWithLevels-API.patch b/patches/api/Add-enchantWithLevels-API.patch
index b512d8bcf0..eead698243 100644
--- a/patches/api/Add-enchantWithLevels-API.patch
+++ b/patches/api/Add-enchantWithLevels-API.patch
@@ -18,7 +18,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * designed and was originally broken.
       */
      @NotNull
-+    @Deprecated // Paper
++    @Deprecated(since = "1.19.3") // Paper
      ItemStack enchantItem(@NotNull final Entity entity, @NotNull final ItemStack item, final int level, final boolean allowTreasures);
  
      /**
@@ -30,7 +30,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * designed and was originally broken.
       */
      @NotNull
-+    @Deprecated // Paper
++    @Deprecated(since = "1.19.3") // Paper
      ItemStack enchantItem(@NotNull final World world, @NotNull final ItemStack item, final int level, final boolean allowTreasures);
  
      /**
@@ -42,7 +42,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * designed and was originally broken.
       */
      @NotNull
-+    @Deprecated // Paper
++    @Deprecated(since = "1.19.3") // Paper
      ItemStack enchantItem(@NotNull final ItemStack item, final int level, final boolean allowTreasures);
  
      // Paper start - Adventure
diff --git a/patches/api/Add-getI18NDisplayName-API.patch b/patches/api/Add-getI18NDisplayName-API.patch
index 8977cf8527..1b29ae0347 100644
--- a/patches/api/Add-getI18NDisplayName-API.patch
+++ b/patches/api/Add-getI18NDisplayName-API.patch
@@ -28,7 +28,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * {@link net.kyori.adventure.text.Component#translatable(net.kyori.adventure.translation.Translatable)} instead.
 +     */
 +    @Nullable
-+    @Deprecated
++    @Deprecated(since = "1.18.1")
 +    String getI18NDisplayName(@Nullable ItemStack item);
 +    // Paper end - add getI18NDisplayName
  }
diff --git a/patches/api/Add-ray-tracing-methods-to-LivingEntity.patch b/patches/api/Add-ray-tracing-methods-to-LivingEntity.patch
index e468a44fdf..6bd2288653 100644
--- a/patches/api/Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/patches/api/Add-ray-tracing-methods-to-LivingEntity.patch
@@ -21,7 +21,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 + * Represents information about a targeted block
 + * @deprecated use {@link org.bukkit.util.RayTraceResult}
 + */
-+@Deprecated(forRemoval = true)
++@Deprecated(forRemoval = true, since = "1.19.3")
 +public class TargetBlockInfo {
 +    private final Block block;
 +    private final BlockFace blockFace;
@@ -64,7 +64,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    /**
 +     * @deprecated use {@link org.bukkit.FluidCollisionMode}
 +     */
-+    @Deprecated(forRemoval = true)
++    @Deprecated(forRemoval = true, since = "1.19.3")
 +    public enum FluidMode {
 +        NEVER(FluidCollisionMode.NEVER),
 +        SOURCE_ONLY(FluidCollisionMode.SOURCE_ONLY),
@@ -94,7 +94,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     *     or null if no block is within maxDistance
 +     * @deprecated use {@link #getTargetBlockExact(int)}
 +     */
-+    @Deprecated(forRemoval = true)
++    @Deprecated(forRemoval = true, since = "1.19.3")
 +    @Nullable
 +    public default Block getTargetBlock(int maxDistance) {
 +        return getTargetBlock(maxDistance, com.destroystokyo.paper.block.TargetBlockInfo.FluidMode.NEVER);
@@ -109,7 +109,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     *     or null if no block is within maxDistance
 +     * @deprecated use {@link #getTargetBlockExact(int, FluidCollisionMode)}
 +     */
-+    @Deprecated(forRemoval = true)
++    @Deprecated(forRemoval = true, since = "1.19.3")
 +    @Nullable
 +    public Block getTargetBlock(int maxDistance, @NotNull com.destroystokyo.paper.block.TargetBlockInfo.FluidMode fluidMode);
 +
@@ -134,7 +134,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     *     or null if no block is targeted
 +     * @deprecated use {@link #getTargetBlockFace(int, FluidCollisionMode)}
 +     */
-+    @Deprecated(forRemoval = true)
++    @Deprecated(forRemoval = true, since = "1.19.3")
 +    @Nullable
 +    public org.bukkit.block.BlockFace getTargetBlockFace(int maxDistance, @NotNull com.destroystokyo.paper.block.TargetBlockInfo.FluidMode fluidMode);
 +
@@ -157,7 +157,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     *     or null if no block is targeted
 +     * @deprecated use {@link #rayTraceBlocks(double)}
 +     */
-+    @Deprecated(forRemoval = true)
++    @Deprecated(forRemoval = true, since = "1.19.3")
 +    @Nullable
 +    public default com.destroystokyo.paper.block.TargetBlockInfo getTargetBlockInfo(int maxDistance) {
 +        return getTargetBlockInfo(maxDistance, com.destroystokyo.paper.block.TargetBlockInfo.FluidMode.NEVER);
@@ -172,7 +172,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     *     or null if no block is targeted
 +     * @deprecated use {@link #rayTraceBlocks(double, FluidCollisionMode)}
 +     */
-+    @Deprecated(forRemoval = true)
++    @Deprecated(forRemoval = true, since = "1.19.3")
 +    @Nullable
 +    public com.destroystokyo.paper.block.TargetBlockInfo getTargetBlockInfo(int maxDistance, @NotNull com.destroystokyo.paper.block.TargetBlockInfo.FluidMode fluidMode);
 +    // Paper end
diff --git a/patches/api/Adventure.patch b/patches/api/Adventure.patch
index 1437c86869..8d7807027d 100644
--- a/patches/api/Adventure.patch
+++ b/patches/api/Adventure.patch
@@ -704,7 +704,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @return a serializer to plain text
 +     * @deprecated will be removed in adventure 5.0.0, use {@link PlainTextComponentSerializer#plainText()}
 +     */
-+    @Deprecated(forRemoval = true)
++    @Deprecated(forRemoval = true, since = "1.18.1")
 +    public static @NotNull PlainComponentSerializer plainSerializer() {
 +        return Bukkit.getUnsafe().plainComponentSerializer();
 +    }
@@ -719,7 +719,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @return a serializer to plain text
 +     * @deprecated use {@link PlainTextComponentSerializer#plainText()}
 +     */
-+    @Deprecated(forRemoval = true)
++    @Deprecated(forRemoval = true, since = "1.18.2")
 +    public static @NotNull PlainTextComponentSerializer plainTextSerializer() {
 +        return Bukkit.getUnsafe().plainTextSerializer();
 +    }
@@ -735,7 +735,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @return a json component serializer
 +     * @deprecated use {@link GsonComponentSerializer#gson()}
 +     */
-+    @Deprecated(forRemoval = true)
++    @Deprecated(forRemoval = true, since = "1.18.2")
 +    public static @NotNull GsonComponentSerializer gsonSerializer() {
 +        return Bukkit.getUnsafe().gsonComponentSerializer();
 +    }
@@ -752,7 +752,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @return a json component serializer
 +     * @deprecated use {@link GsonComponentSerializer#colorDownsamplingGson()}
 +     */
-+    @Deprecated(forRemoval = true)
++    @Deprecated(forRemoval = true, since = "1.18.2")
 +    public static @NotNull GsonComponentSerializer colorDownsamplingGsonSerializer() {
 +        return Bukkit.getUnsafe().colorDownsamplingGsonComponentSerializer();
 +    }
@@ -772,7 +772,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @return a section serializer
 +     * @deprecated use {@link LegacyComponentSerializer#legacySection()}
 +     */
-+    @Deprecated(forRemoval = true)
++    @Deprecated(forRemoval = true, since = "1.18.2")
 +    public static @NotNull LegacyComponentSerializer legacySectionSerializer() {
 +        return Bukkit.getUnsafe().legacyComponentSerializer();
 +    }
diff --git a/patches/api/Allow-Blocks-to-be-accessed-via-a-long-key.patch b/patches/api/Allow-Blocks-to-be-accessed-via-a-long-key.patch
index 9fe94e7a13..07ef69cffe 100644
--- a/patches/api/Allow-Blocks-to-be-accessed-via-a-long-key.patch
+++ b/patches/api/Allow-Blocks-to-be-accessed-via-a-long-key.patch
@@ -40,7 +40,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @see Block#getBlockKey(int, int, int)
 +     * @deprecated only encodes y block ranges from -512 to 511 and represents an already changed implementation detail
 +     */
-+    @Deprecated
++    @Deprecated(since = "1.18.1")
 +    public long toBlockKey() {
 +        return Block.getBlockKey(getBlockX(), getBlockY(), getBlockZ());
 +    }
@@ -67,7 +67,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated only encodes y block ranges from -512 to 511 and represents an already changed implementation detail
 +     */
 +    @NotNull
-+    @Deprecated
++    @Deprecated(since = "1.18.1")
 +    public default Block getBlockAtKey(long key) {
 +        int x = Block.getBlockKeyX(key);
 +        int y = Block.getBlockKeyY(key);
@@ -83,7 +83,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @see Block#getBlockKey(int, int, int)
 +     */
 +    @NotNull
-+    @Deprecated
++    @Deprecated(since = "1.18.1")
 +    public default Location getLocationAtKey(long key) {
 +        int x = Block.getBlockKeyX(key);
 +        int y = Block.getBlockKeyY(key);
@@ -111,7 +111,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @return This block's x, y, and z coordinates packed into a long value
 +     * @deprecated see {@link #getBlockKey(int, int, int)}
 +     */
-+    @Deprecated
++    @Deprecated(since = "1.18.1")
 +    public default long getBlockKey() {
 +        return Block.getBlockKey(this.getX(), this.getY(), this.getZ());
 +    }
@@ -137,7 +137,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @return This block's x, y, and z coordinates packed into a long value
 +     * @deprecated only encodes y block ranges from -512 to 511 and represents an already changed implementation detail
 +     */
-+    @Deprecated
++    @Deprecated(since = "1.18.1")
 +    public static long getBlockKey(int x, int y, int z) {
 +        return ((long)x & 0x7FFFFFF) | (((long)z & 0x7FFFFFF) << 27) | ((long)y << 54);
 +    }
@@ -149,7 +149,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @return The x component from the packed value.
 +     * @deprecated see {@link #getBlockKey(int, int, int)}
 +     */
-+    @Deprecated
++    @Deprecated(since = "1.18.1")
 +    public static int getBlockKeyX(long packed) {
 +        return (int) ((packed << 37) >> 37);
 +    }
@@ -161,7 +161,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @return The y component from the packed value.
 +     * @deprecated see {@link #getBlockKey(int, int, int)}
 +     */
-+    @Deprecated
++    @Deprecated(since = "1.18.1")
 +    public static int getBlockKeyY(long packed) {
 +        return (int) (packed >> 54);
 +    }
@@ -173,7 +173,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @return The z component from the packed value.
 +     * @deprecated see {@link #getBlockKey(int, int, int)}
 +     */
-+    @Deprecated
++    @Deprecated(since = "1.18.1")
 +    public static int getBlockKeyZ(long packed) {
 +        return (int) ((packed << 10) >> 37);
 +    }
diff --git a/patches/api/Async-Chunks-API.patch b/patches/api/Async-Chunks-API.patch
index 2dbf439b93..dc3342cb16 100644
--- a/patches/api/Async-Chunks-API.patch
+++ b/patches/api/Async-Chunks-API.patch
@@ -31,7 +31,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     *
 +     * @deprecated Use either the Future or the Consumer based methods
 +     */
-+    @Deprecated
++    @Deprecated(since = "1.13.1")
 +    public static interface ChunkLoadCallback extends java.util.function.Consumer<Chunk> {
 +        public void onLoad(@NotNull Chunk chunk);
 +
@@ -61,7 +61,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @param cb Callback to receive the chunk when it is loaded.
 +     *           will be executed synchronously
 +     */
-+    @Deprecated
++    @Deprecated(since = "1.13.1")
 +    public default void getChunkAtAsync(int x, int z, @NotNull ChunkLoadCallback cb) {
 +        getChunkAtAsync(x, z, true).thenAccept(cb::onLoad).exceptionally((ex) -> {
 +            Bukkit.getLogger().log(java.util.logging.Level.WARNING, "Exception in chunk load callback", ex);
@@ -87,7 +87,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @param cb Callback to receive the chunk when it is loaded.
 +     *           will be executed synchronously
 +     */
-+    @Deprecated
++    @Deprecated(since = "1.13.1")
 +    public default void getChunkAtAsync(@NotNull Location loc, @NotNull ChunkLoadCallback cb) {
 +        getChunkAtAsync(loc, true).thenAccept(cb::onLoad).exceptionally((ex) -> {
 +            Bukkit.getLogger().log(java.util.logging.Level.WARNING, "Exception in chunk load callback", ex);
@@ -113,7 +113,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @param cb Callback to receive the chunk when it is loaded.
 +     *           will be executed synchronously
 +     */
-+    @Deprecated
++    @Deprecated(since = "1.13.1")
 +    public default void getChunkAtAsync(@NotNull Block block, @NotNull ChunkLoadCallback cb) {
 +        getChunkAtAsync(block, true).thenAccept(cb::onLoad).exceptionally((ex) -> {
 +            Bukkit.getLogger().log(java.util.logging.Level.WARNING, "Exception in chunk load callback", ex);
diff --git a/patches/api/Basic-PlayerProfile-API.patch b/patches/api/Basic-PlayerProfile-API.patch
index a7218d8287..9cdb49297c 100644
--- a/patches/api/Basic-PlayerProfile-API.patch
+++ b/patches/api/Basic-PlayerProfile-API.patch
@@ -40,7 +40,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @return The previous Name
 +     */
 +    @NotNull
-+    @Deprecated(forRemoval = true)
++    @Deprecated(forRemoval = true, since = "1.18.1")
 +    String setName(@Nullable String name);
 +
 +    /**
@@ -55,7 +55,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @return The previous UUID
 +     */
 +    @Nullable
-+    @Deprecated(forRemoval = true)
++    @Deprecated(forRemoval = true, since = "1.18.1")
 +    UUID setId(@Nullable UUID uuid);
 +
 +    /**
diff --git a/patches/api/Complete-resource-pack-API.patch b/patches/api/Complete-resource-pack-API.patch
index 325e6937c1..b464bfa7d4 100644
--- a/patches/api/Complete-resource-pack-API.patch
+++ b/patches/api/Complete-resource-pack-API.patch
@@ -169,7 +169,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @return the most recent hash or null
 +     * @deprecated This is no longer sent from the client and will always be null
 +     */
-+    @Deprecated(forRemoval = true)
++    @Deprecated(forRemoval = true, since = "1.13.2")
 +    @org.jetbrains.annotations.Contract("-> null")
 +    default @Nullable String getResourcePackHash() {
 +        return null;
diff --git a/patches/api/Expand-FallingBlock-API.patch b/patches/api/Expand-FallingBlock-API.patch
index b02640ccfe..8837cf557c 100644
--- a/patches/api/Expand-FallingBlock-API.patch
+++ b/patches/api/Expand-FallingBlock-API.patch
@@ -20,7 +20,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated Use {@link #spawn(Location, Class, Consumer)} (or a variation thereof) in combination with {@link FallingBlock#setBlockData(BlockData)}
       */
      @NotNull
-+    @Deprecated // Paper
++    @Deprecated(since = "1.20.2") // Paper
      public FallingBlock spawnFallingBlock(@NotNull Location location, @NotNull MaterialData data) throws IllegalArgumentException;
  
      /**
@@ -31,7 +31,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated Use {@link #spawn(Location, Class, Consumer)} (or a variation thereof) in combination with {@link FallingBlock#setBlockData(BlockData)}
       */
      @NotNull
-+    @org.jetbrains.annotations.ApiStatus.Obsolete // Paper
++    @org.jetbrains.annotations.ApiStatus.Obsolete(since = "1.20.2") // Paper
      public FallingBlock spawnFallingBlock(@NotNull Location location, @NotNull BlockData data) throws IllegalArgumentException;
  
      /**
diff --git a/patches/api/IllegalPacketEvent.patch b/patches/api/IllegalPacketEvent.patch
index 6a60ddff00..508f23a0d1 100644
--- a/patches/api/IllegalPacketEvent.patch
+++ b/patches/api/IllegalPacketEvent.patch
@@ -25,7 +25,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +/**
 + * @deprecated Not used
 + */
-+@Deprecated
++@Deprecated(since = "1.16.4")
 +public class IllegalPacketEvent extends PlayerEvent {
 +
 +    private static final HandlerList HANDLER_LIST = new HandlerList();
diff --git a/patches/api/Improve-Registry.patch b/patches/api/Improve-Registry.patch
index f0f3c2d868..2c0d2259a2 100644
--- a/patches/api/Improve-Registry.patch
+++ b/patches/api/Improve-Registry.patch
@@ -129,7 +129,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * can exist without a key.
 +     */
 +    @Override
-+    @Deprecated
++    @Deprecated(since = "1.20.4")
 +    public abstract @NotNull NamespacedKey getKey();
 +    // Paper end - deprecate getKey
  }
diff --git a/patches/api/Missing-Entity-API.patch b/patches/api/Missing-Entity-API.patch
index 31f40c2071..c6813261b0 100644
--- a/patches/api/Missing-Entity-API.patch
+++ b/patches/api/Missing-Entity-API.patch
@@ -867,7 +867,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @param onBack is on its back
 +     * @deprecated use {@link #setOnBack(boolean)}
 +     */
-+    @Deprecated(forRemoval = true)
++    @Deprecated(forRemoval = true, since = "1.19")
 +    default void setIsOnBack(boolean onBack) {
 +        this.setOnBack(onBack);
 +    }
@@ -878,7 +878,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @param sitting is currently sitting
 +     * @deprecated use {@link #setSitting(boolean)}
 +     */
-+    @Deprecated(forRemoval = true)
++    @Deprecated(forRemoval = true, since = "1.19")
 +    default void setIsSitting(boolean sitting) {
 +        this.setSitting(sitting);
 +    }
@@ -1478,7 +1478,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @return ticks left on cooldown
 +     * @deprecated Hopper minecarts don't have cooldowns anymore
 +     */
-+    @Deprecated(forRemoval = true)
++    @Deprecated(forRemoval = true, since = "1.19.4")
 +    int getPickupCooldown();
 +
 +    /**
@@ -1487,7 +1487,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @param cooldown cooldown length in ticks
 +     * @deprecated Hopper minecarts don't have cooldowns anymore
 +     */
-+    @Deprecated(forRemoval = true)
++    @Deprecated(forRemoval = true, since = "1.19.4")
 +    void setPickupCooldown(int cooldown);
 +    // Paper end
  }
diff --git a/patches/api/More-Enchantment-API.patch b/patches/api/More-Enchantment-API.patch
index f6d7c7a9f8..0d0a49bca8 100644
--- a/patches/api/More-Enchantment-API.patch
+++ b/patches/api/More-Enchantment-API.patch
@@ -14,7 +14,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@
 +package io.papermc.paper.enchantments;
 +
-+@Deprecated(forRemoval = true, since = "As of 1.20.5 enchantments do not have a rarity.")
++/**
++ * @deprecated Enchantments do not have a "rarity" since 1.20.5
++ */
++@Deprecated(forRemoval = true, since = "1.20.5")
 +public enum EnchantmentRarity {
 +
 +    COMMON(10),
diff --git a/patches/api/Player-Tab-List-and-Title-APIs.patch b/patches/api/Player-Tab-List-and-Title-APIs.patch
index e3cf07cf46..92f18c3aa3 100644
--- a/patches/api/Player-Tab-List-and-Title-APIs.patch
+++ b/patches/api/Player-Tab-List-and-Title-APIs.patch
@@ -37,7 +37,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 + *
 + * @deprecated use {@link net.kyori.adventure.title.Title}
 + */
-+@Deprecated
++@Deprecated(since = "1.16.5")
 +public final class Title {
 +
 +    /**
diff --git a/patches/api/Player.setPlayerProfile-API.patch b/patches/api/Player.setPlayerProfile-API.patch
index eeac20201e..7d85b45d3d 100644
--- a/patches/api/Player.setPlayerProfile-API.patch
+++ b/patches/api/Player.setPlayerProfile-API.patch
@@ -16,7 +16,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated use {@link #createProfile(UUID, String)}
       */
      @NotNull
-+    @Deprecated // Paper
++    @Deprecated(since = "1.18.1") // Paper
      public static PlayerProfile createPlayerProfile(@Nullable UUID uniqueId, @Nullable String name) {
          return server.createPlayerProfile(uniqueId, name);
      }
@@ -27,7 +27,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated use {@link #createProfile(UUID)}
       */
      @NotNull
-+    @Deprecated // Paper
++    @Deprecated(since = "1.18.1") // Paper
      public static PlayerProfile createPlayerProfile(@NotNull UUID uniqueId) {
          return server.createPlayerProfile(uniqueId);
      }
@@ -38,7 +38,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated use {@link #createProfile(String)}
       */
      @NotNull
-+    @Deprecated // Paper
++    @Deprecated(since = "1.18.1") // Paper
      public static PlayerProfile createPlayerProfile(@NotNull String name) {
          return server.createPlayerProfile(name);
      }
@@ -66,7 +66,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated use {@link #createProfile(UUID, String)}
       */
      @NotNull
-+    @Deprecated // Paper
++    @Deprecated(since = "1.18.1") // Paper
      PlayerProfile createPlayerProfile(@Nullable UUID uniqueId, @Nullable String name);
  
      /**
@@ -77,7 +77,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated use {@link #createProfile(UUID)}
       */
      @NotNull
-+    @Deprecated // Paper
++    @Deprecated(since = "1.18.1") // Paper
      PlayerProfile createPlayerProfile(@NotNull UUID uniqueId);
  
      /**
@@ -88,7 +88,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated use {@link #createProfile(String)}
       */
      @NotNull
-+    @Deprecated
++    @Deprecated(since = "1.18.1") // Paper
      PlayerProfile createPlayerProfile(@NotNull String name);
  
      /**
@@ -133,7 +133,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
   * {@link Server#createPlayerProfile(UUID, String)}.
 + * @deprecated see {@link com.destroystokyo.paper.profile.PlayerProfile}
   */
-+@Deprecated // Paper
++@Deprecated(since = "1.18.1") // Paper
  public interface PlayerProfile extends Cloneable, ConfigurationSerializable {
  
      /**
@@ -141,7 +141,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
       * @return the player's unique id, or <code>null</code> if not available
       */
      @Nullable
-+    @Deprecated // Paper
++    @Deprecated(since = "1.18.1") // Paper
      UUID getUniqueId();
  
      /**
diff --git a/patches/api/RangedEntity-API.patch b/patches/api/RangedEntity-API.patch
index d3596fe758..746006b9de 100644
--- a/patches/api/RangedEntity-API.patch
+++ b/patches/api/RangedEntity-API.patch
@@ -34,7 +34,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @param raiseHands Whether the entities hands are raised to charge attack
 +     * @deprecated use {@link #setAggressive(boolean)}
 +     */
-+    @Deprecated
++    @Deprecated(since = "1.19.2")
 +    void setChargingAttack(boolean raiseHands);
 +
 +    /**
@@ -42,7 +42,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @return If entities hands are raised
 +     * @deprecated use {@link #isHandRaised()}
 +     */
-+    @Deprecated
++    @Deprecated(since = "1.19.2")
 +    default boolean isChargingAttack() {
 +        return isHandRaised();
 +    }
diff --git a/patches/api/Replace-ItemFlag.HIDE_POTION_EFFECTS.patch b/patches/api/Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
index 4d30647a36..ca88866687 100644
--- a/patches/api/Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
+++ b/patches/api/Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
@@ -32,7 +32,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * </ul>
 +     * @deprecated use {@link #HIDE_ADDITIONAL_TOOLTIP}
 +     */
-+    @Deprecated
++    @Deprecated(since = "1.20.5")
 +    public static final ItemFlag HIDE_ITEM_SPECIFICS = HIDE_ADDITIONAL_TOOLTIP;
 +    // Paper end
  }
diff --git a/patches/api/Suspicious-Effect-Entry-API.patch b/patches/api/Suspicious-Effect-Entry-API.patch
index e54332a4d4..0a5aba158e 100644
--- a/patches/api/Suspicious-Effect-Entry-API.patch
+++ b/patches/api/Suspicious-Effect-Entry-API.patch
@@ -85,7 +85,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
       * @return true if the effects to be applied to the suspicious stew changed
       * as a result of this call
       */
-+    @Deprecated(forRemoval = true) // Paper - add overloads to use suspicious effect entry to mushroom cow and suspicious stew meta
++    @Deprecated(forRemoval = true, since = "1.20.2") // Paper - add overloads to use suspicious effect entry to mushroom cow and suspicious stew meta
      boolean addEffectToNextStew(@NotNull PotionEffect effect, boolean overwrite);
  
 +    // Paper start - add overloads to use suspicious effect entry to mushroom cow and suspicious stew meta
@@ -117,7 +117,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @return duration of the effect (in ticks)
 +     * @deprecated Mushroom cows can now hold multiple effects, use {@link #getStewEffects()}
 +     */
-+    @Deprecated(forRemoval = true)
++    @Deprecated(forRemoval = true, since = "1.20.2")
 +    @org.jetbrains.annotations.Contract("-> fail")
 +    default int getStewEffectDuration() {
 +        throw new UnsupportedOperationException("Mushroom cows can now hold multiple effects. Use #getStewEffects");
@@ -130,7 +130,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @param duration duration of the effect (in ticks)
 +     * @deprecated Mushroom cows can now hold multiple effects, use {@link #setStewEffects(java.util.List)}
 +     */
-+    @Deprecated(forRemoval = true)
++    @Deprecated(forRemoval = true, since = "1.20.2")
 +    @org.jetbrains.annotations.Contract("_ -> fail")
 +    default void setStewEffectDuration(int duration) {
 +        throw new UnsupportedOperationException("Mushroom cows can now hold multiple effects. Use #setStewEffects");
@@ -144,7 +144,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated Mushroom cows can now hold multiple effects, use {@link #getStewEffects()}
 +     * @throws UnsupportedOperationException
 +     */
-+    @Deprecated(forRemoval = true)
++    @Deprecated(forRemoval = true, since = "1.20.2")
 +    @org.jetbrains.annotations.Contract("-> fail")
 +    default org.bukkit.potion.PotionEffectType getStewEffectType() {
 +        throw new UnsupportedOperationException("Mushroom cows can now hold multiple effects. Use #getStewEffects");
@@ -159,7 +159,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated Mushroom cows can now hold multiple effects, use {@link #setStewEffects(java.util.List)}
 +     * @throws UnsupportedOperationException
 +     */
-+    @Deprecated(forRemoval = true)
++    @Deprecated(forRemoval = true, since = "1.20.2")
 +    @org.jetbrains.annotations.Contract("_ -> fail")
 +    default void setStewEffect(@org.jetbrains.annotations.Nullable org.bukkit.potion.PotionEffectType type) {
 +        throw new UnsupportedOperationException("Mushroom cows can now hold multiple effects. Use #setStewEffects");
diff --git a/patches/api/ensureServerConversions-API.patch b/patches/api/ensureServerConversions-API.patch
index a9345d73ab..98773c6bd3 100644
--- a/patches/api/ensureServerConversions-API.patch
+++ b/patches/api/ensureServerConversions-API.patch
@@ -11,7 +11,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
 @@ -0,0 +0,0 @@ public interface ItemFactory {
-     @Deprecated
+     @Deprecated(since = "1.18.1")
      String getI18NDisplayName(@Nullable ItemStack item);
      // Paper end - add getI18NDisplayName
 +
diff --git a/patches/api/improve-BanList-types.patch b/patches/api/improve-BanList-types.patch
index a5b160bafc..ae94d5b071 100644
--- a/patches/api/improve-BanList-types.patch
+++ b/patches/api/improve-BanList-types.patch
@@ -63,7 +63,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
       * Represents a ban-type that a {@link BanList} may track.
 +     * @deprecated use {@link io.papermc.paper.ban.BanListType} to enforce the correct return value at compile time.
       */
-+    @Deprecated // Paper - BanList Type Improvements
++    @Deprecated(since = "1.20.4") // Paper - BanList Type Improvements
      public enum Type {
          /**
           * Banned player names
@@ -78,7 +78,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @deprecated use {@link #getBanList(io.papermc.paper.ban.BanListType)} to enforce the correct return value at compile time.
       */
      @NotNull
-+    @Deprecated // Paper - add BanListType (which has a generic)
++    @Deprecated(since = "1.20.4") // Paper - add BanListType (which has a generic)
      public static <T extends BanList<?>> T getBanList(@NotNull BanList.Type type) {
          return server.getBanList(type);
      }