Deprecate Bukkit#getLogger (#10388)

* Deprecate Bukkit#getLogger

* fix typo in MaterialSetTags

* change to Internal and squash into other patch

* improve api note message

---------

Co-authored-by: Jake Potrebic <[email protected]>

14 files changed, 90 insertions, 60 deletions

diff --git a/patches/api/0154-Add-Material-Tags.patch b/patches/api/0154-Add-Material-Tags.patch
index f69ba8cace..12194664b8 100644
--- a/patches/api/0154-Add-Material-Tags.patch
+++ b/patches/api/0154-Add-Material-Tags.patch
@@ -115,7 +115,7 @@ index 0000000000000000000000000000000000000000..a02a02aa0c87e0f0ed9e509e4dcab015
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/MaterialTags.java b/src/main/java/com/destroystokyo/paper/MaterialTags.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..4e7a1e26d3dddd2ccba4fa5d02e6752313507612
+index 0000000000000000000000000000000000000000..6dc176b694ff4f50ca4b665c3cf82212cf21f16f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java
 @@ -0,0 +1,717 @@
@@ -518,7 +518,7 @@ index 0000000000000000000000000000000000000000..4e7a1e26d3dddd2ccba4fa5d02e67523
 +    /**
 +     * Covers the variants of a redstone torch.
 +     */
-+    public static final MaterialSetTag REDSTONE_TORCH = new MaterialSetTag(keyFor("restone_torch"))
++    public static final MaterialSetTag REDSTONE_TORCH = new MaterialSetTag(keyFor("redstone_torch"))
 +        .add(Material.REDSTONE_TORCH, Material.REDSTONE_WALL_TORCH)
 +        .ensureSize("REDSTONE_TORCH", 2).lock();
 +
@@ -1132,7 +1132,7 @@ index 0000000000000000000000000000000000000000..5376e51adf5af15572b0d760b17f2de6
 +        .ensureSize("WATER_BASED", 11).lock();
 +}
 diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
-index 85c48fa2d11e6ec8d10f6924ea57f9a9dd800d12..971bc2e3ae0c265664e2fc3105f4be3027edce26 100644
+index ec50179dd92402ad016bb2100251db5c5bf9d0c2..894e72aa97cd272ae57a91165cca0737a6d5742d 100644
 --- a/src/main/java/org/bukkit/Tag.java
 +++ b/src/main/java/org/bukkit/Tag.java
 @@ -11,6 +11,10 @@ import org.jetbrains.annotations.NotNull;
diff --git a/patches/api/0173-Fix-Spigot-annotation-mistakes.patch b/patches/api/0173-Fix-Spigot-annotation-mistakes.patch
index 77f24e2f0d..4208c6a42e 100644
--- a/patches/api/0173-Fix-Spigot-annotation-mistakes.patch
+++ b/patches/api/0173-Fix-Spigot-annotation-mistakes.patch
@@ -40,7 +40,7 @@ index ac420f0059fc50d3e1294f85df7515c9e17ff78f..24daba85ce4129fb0babe67570059ca8
      public static Art getById(int id) {
          return BY_ID.get(id);
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index ac84e6d10a337f767477177ef90ad10d754341e6..567a0cda774ce2e28e1466c0c6b1e07b931b4008 100644
+index ac84e6d10a337f767477177ef90ad10d754341e6..4716b9a9ebaf3deb0a262d4ea1da492547be4913 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -868,9 +868,8 @@ public final class Bukkit {
@@ -54,7 +54,22 @@ index ac84e6d10a337f767477177ef90ad10d754341e6..567a0cda774ce2e28e1466c0c6b1e07b
      @Nullable
      public static MapView getMap(int id) {
          return server.getMap(id);
-@@ -1337,10 +1336,8 @@ public final class Bukkit {
+@@ -949,8 +948,14 @@ public final class Bukkit {
+      * Returns the primary logger associated with this server instance.
+      *
+      * @return Logger associated with this server
++     * @see org.bukkit.plugin.Plugin#getSLF4JLogger()
++     * @apiNote This logger is for the Minecraft server software, not for specific plugins. You should
++     * use a logger for a specific plugin, either via {@link org.bukkit.plugin.Plugin#getSLF4JLogger()}
++     * or {@link org.bukkit.plugin.Plugin#getLogger()} or create a specific logger for a class via slf4j.
++     * That way, log messages contain contextual information about the source of the message.
+      */
+     @NotNull
++    @org.jetbrains.annotations.ApiStatus.Internal // Paper - internalize Bukkit#getLogger
+     public static Logger getLogger() {
+         return server.getLogger();
+     }
+@@ -1337,10 +1342,8 @@ public final class Bukkit {
       * @param name the name the player to retrieve
       * @return an offline player
       * @see #getOfflinePlayer(java.util.UUID)
@@ -66,7 +81,7 @@ index ac84e6d10a337f767477177ef90ad10d754341e6..567a0cda774ce2e28e1466c0c6b1e07b
      @NotNull
      public static OfflinePlayer getOfflinePlayer(@NotNull String name) {
          return server.getOfflinePlayer(name);
-@@ -1931,7 +1928,7 @@ public final class Bukkit {
+@@ -1931,7 +1934,7 @@ public final class Bukkit {
       *
       * @return the scoreboard manager or null if no worlds are loaded.
       */
@@ -519,7 +534,7 @@ index 6277451c3c6c551078c237cd767b6d70c4f585ea..10f5cfb1885833a1d2c1027c03974da4
      CRACKED(0x0),
      GLYPHED(0x1),
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 050cdd5147814b39d158f0ce0fa8f5aa20894cf7..e5844d4a9808984fa21049401ed117102a1c4db8 100644
+index 050cdd5147814b39d158f0ce0fa8f5aa20894cf7..1f98a99eea0fb9a7ebef5d650640e7dac392416e 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -728,9 +728,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -533,7 +548,22 @@ index 050cdd5147814b39d158f0ce0fa8f5aa20894cf7..e5844d4a9808984fa21049401ed11710
      @Nullable
      public MapView getMap(int id);
  
-@@ -1127,10 +1126,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -797,8 +796,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+      * Returns the primary logger associated with this server instance.
+      *
+      * @return Logger associated with this server
++     * @see org.bukkit.plugin.Plugin#getSLF4JLogger()
++     * @apiNote This logger is for the Minecraft server software, not for specific plugins. You should
++     * use a logger for a specific plugin, either via {@link org.bukkit.plugin.Plugin#getSLF4JLogger()}
++     * or {@link org.bukkit.plugin.Plugin#getLogger()} or create a specific logger for a class via slf4j.
++     * That way, log messages contain contextual information about the source of the message.
+      */
+     @NotNull
++    @org.jetbrains.annotations.ApiStatus.Internal // Paper - internalize Bukkit#getLogger
+     public Logger getLogger();
+ 
+     /**
+@@ -1127,10 +1132,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @param name the name the player to retrieve
       * @return an offline player
       * @see #getOfflinePlayer(java.util.UUID)
@@ -545,7 +575,7 @@ index 050cdd5147814b39d158f0ce0fa8f5aa20894cf7..e5844d4a9808984fa21049401ed11710
      @NotNull
      public OfflinePlayer getOfflinePlayer(@NotNull String name);
  
-@@ -1630,7 +1627,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1630,7 +1633,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       *
       * @return the scoreboard manager or null if no worlds are loaded.
       */
@@ -818,7 +848,7 @@ index f124b35ec76e6cb6a1a0dc464005087043c3efd0..f50aaddf8582be55fd4860ad374d8f22
 +@Deprecated(forRemoval = true) // Paper
  public interface LingeringPotion extends ThrownPotion { }
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 71a4dc422b9ff25dd9bac58e5996d9996c4bc479..582d6d8eed0b0145fa58c977013c4914e99c40a4 100644
+index 6dbd3524af80adc9dd7a94444e668220d3fccaea..3e5b7dc8f72bd211a18ec6a930c4f02beea4205a 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -716,7 +716,9 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0181-Expose-the-internal-current-tick.patch b/patches/api/0181-Expose-the-internal-current-tick.patch
index 9a0fe90fb6..4db7cb0ddf 100644
--- a/patches/api/0181-Expose-the-internal-current-tick.patch
+++ b/patches/api/0181-Expose-the-internal-current-tick.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose the internal current tick
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 567a0cda774ce2e28e1466c0c6b1e07b931b4008..80144dc81249f7198bee5e6281362fd704e006d4 100644
+index 4716b9a9ebaf3deb0a262d4ea1da492547be4913..999f72af999a95642b5865144d1da9bd9f86aaee 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2469,6 +2469,10 @@ public final class Bukkit {
+@@ -2475,6 +2475,10 @@ public final class Bukkit {
      public static com.destroystokyo.paper.profile.PlayerProfile createProfileExact(@Nullable UUID uuid, @Nullable String name) {
          return server.createProfileExact(uuid, name);
      }
@@ -20,10 +20,10 @@ index 567a0cda774ce2e28e1466c0c6b1e07b931b4008..80144dc81249f7198bee5e6281362fd7
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index e5844d4a9808984fa21049401ed117102a1c4db8..031fd20bb361fb9befe62ec8006f42156bfe2747 100644
+index 1f98a99eea0fb9a7ebef5d650640e7dac392416e..8445a62af2ca5dd47b4905d75b31d9d6ea0623ea 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2149,5 +2149,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2155,5 +2155,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull
      com.destroystokyo.paper.profile.PlayerProfile createProfileExact(@Nullable UUID uuid, @Nullable String name);
diff --git a/patches/api/0187-Add-tick-times-API.patch b/patches/api/0187-Add-tick-times-API.patch
index c2d69a38e7..350b7fda96 100644
--- a/patches/api/0187-Add-tick-times-API.patch
+++ b/patches/api/0187-Add-tick-times-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add tick times API
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 80144dc81249f7198bee5e6281362fd704e006d4..a839e8684de0c915f8b7edfe5e87978d774f7bde 100644
+index 999f72af999a95642b5865144d1da9bd9f86aaee..10aea8b80b49a6c47b04de4d3f33eb786f08651b 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2141,6 +2141,25 @@ public final class Bukkit {
+@@ -2147,6 +2147,25 @@ public final class Bukkit {
      public static double[] getTPS() {
          return server.getTPS();
      }
@@ -35,10 +35,10 @@ index 80144dc81249f7198bee5e6281362fd704e006d4..a839e8684de0c915f8b7edfe5e87978d
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 031fd20bb361fb9befe62ec8006f42156bfe2747..496e769cb77d856b4a0b4dc63ac466fdf6cbd3f9 100644
+index 8445a62af2ca5dd47b4905d75b31d9d6ea0623ea..4b3fadfc90299cc717d85cb9856662e2b3230872 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1811,6 +1811,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1817,6 +1817,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull
      public double[] getTPS();
diff --git a/patches/api/0188-Expose-MinecraftServer-isRunning.patch b/patches/api/0188-Expose-MinecraftServer-isRunning.patch
index 641ee5ac54..7800f62ac6 100644
--- a/patches/api/0188-Expose-MinecraftServer-isRunning.patch
+++ b/patches/api/0188-Expose-MinecraftServer-isRunning.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Expose MinecraftServer#isRunning
 This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading.
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index a839e8684de0c915f8b7edfe5e87978d774f7bde..00320a15e4edbcbab182b4064b05d3a19dc441ce 100644
+index 10aea8b80b49a6c47b04de4d3f33eb786f08651b..803ca460cf91f6760d7b16e1310a23d6b09725b3 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2492,6 +2492,15 @@ public final class Bukkit {
+@@ -2498,6 +2498,15 @@ public final class Bukkit {
      public static int getCurrentTick() {
          return server.getCurrentTick();
      }
@@ -26,10 +26,10 @@ index a839e8684de0c915f8b7edfe5e87978d774f7bde..00320a15e4edbcbab182b4064b05d3a1
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 496e769cb77d856b4a0b4dc63ac466fdf6cbd3f9..d606b1d1ac37a13607c893e14ad88b26d1296ab0 100644
+index 4b3fadfc90299cc717d85cb9856662e2b3230872..1575218ee7eb563b17b542b578c10d125889a7be 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2171,5 +2171,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2177,5 +2177,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @return Current tick
       */
      int getCurrentTick();
diff --git a/patches/api/0196-Add-Mob-Goal-API.patch b/patches/api/0196-Add-Mob-Goal-API.patch
index 5f64cd9ab9..4b35a66541 100644
--- a/patches/api/0196-Add-Mob-Goal-API.patch
+++ b/patches/api/0196-Add-Mob-Goal-API.patch
@@ -226,10 +226,10 @@ index 0000000000000000000000000000000000000000..e21f7574763dd4f13794f91bbef192ef
 +    <T extends Mob> Collection<Goal<T>> getRunningGoalsWithout(@NotNull T mob, @NotNull GoalType type);
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index ed65e84868f6b3b9272c8266244d7ab3725a7699..946dc3c3bde31c7a02ac4733ee8c88e63d8baff8 100644
+index 377e9979c5bbc50398d521ff038956f80d7376b1..9e14744feb0c5ad0b8df1bcbaf19d75327ad2148 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2513,6 +2513,16 @@ public final class Bukkit {
+@@ -2519,6 +2519,16 @@ public final class Bukkit {
      public static boolean isStopping() {
          return server.isStopping();
      }
@@ -247,10 +247,10 @@ index ed65e84868f6b3b9272c8266244d7ab3725a7699..946dc3c3bde31c7a02ac4733ee8c88e6
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index e87718db19c902fe385328866767e46c397b7e86..000713e09564c96a7d3c9ceb0371de26a11ff82e 100644
+index 7ed98561c6320132501c89d70254870e6ec03e77..1fda10dcabdcfe0cd51c3532576bddeb4fa877b8 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2188,5 +2188,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2194,5 +2194,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @return true if server is in the process of being shutdown
       */
      boolean isStopping();
diff --git a/patches/api/0218-Add-getOfflinePlayerIfCached-String.patch b/patches/api/0218-Add-getOfflinePlayerIfCached-String.patch
index de11733eec..2e8d4ad4b3 100644
--- a/patches/api/0218-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/api/0218-Add-getOfflinePlayerIfCached-String.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String)
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 946dc3c3bde31c7a02ac4733ee8c88e63d8baff8..b4341f5c9adcebd13a0f62ebc32d081a65d71ba4 100644
+index 9e14744feb0c5ad0b8df1bcbaf19d75327ad2148..e832c6a8a10bc29d9ab20cbdf394cf836eb2f6a5 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1355,6 +1355,27 @@ public final class Bukkit {
+@@ -1361,6 +1361,27 @@ public final class Bukkit {
          return server.getOfflinePlayer(name);
      }
  
@@ -37,10 +37,10 @@ index 946dc3c3bde31c7a02ac4733ee8c88e63d8baff8..b4341f5c9adcebd13a0f62ebc32d081a
       * Gets the player by the given UUID, regardless if they are offline or
       * online.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 000713e09564c96a7d3c9ceb0371de26a11ff82e..3c64eb18b7cb6ac371b094a581da8a033e90d00f 100644
+index 1fda10dcabdcfe0cd51c3532576bddeb4fa877b8..9477563308adc64fff065eb0a50654baa0d22b84 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1141,6 +1141,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1147,6 +1147,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      public OfflinePlayer getOfflinePlayer(@NotNull String name);
  
diff --git a/patches/api/0280-Add-basic-Datapack-API.patch b/patches/api/0280-Add-basic-Datapack-API.patch
index dafb02a98d..61600f3668 100644
--- a/patches/api/0280-Add-basic-Datapack-API.patch
+++ b/patches/api/0280-Add-basic-Datapack-API.patch
@@ -70,7 +70,7 @@ index 0000000000000000000000000000000000000000..58f78d5e91beacaf710f62461cf869f7
 +
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 7e049d9934df2259ea566aaa69ce118ce829529d..8ca65a413295c1f104cc47f2f71cbc80345a9812 100644
+index 4b3c91575f2609ad1b1177384f6f21151a535054..6ac4c0c6c2245e6bee9575ff4804994648112d78 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -328,9 +328,11 @@ public final class Bukkit {
@@ -85,7 +85,7 @@ index 7e049d9934df2259ea566aaa69ce118ce829529d..8ca65a413295c1f104cc47f2f71cbc80
      public static DataPackManager getDataPackManager() {
          return server.getDataPackManager();
      }
-@@ -2556,6 +2558,14 @@ public final class Bukkit {
+@@ -2562,6 +2564,14 @@ public final class Bukkit {
      public static com.destroystokyo.paper.entity.ai.MobGoals getMobGoals() {
          return server.getMobGoals();
      }
@@ -101,7 +101,7 @@ index 7e049d9934df2259ea566aaa69ce118ce829529d..8ca65a413295c1f104cc47f2f71cbc80
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index c3e0b40a845a30790f31a0cf591bfa7f0cd87fee..be0d3ea564503441910aecdfe3d45b0303facc19 100644
+index 5bb94245c33105e57131b3d0867ef707c4aed79c..052d0e420f2631ff925bb5df4a41a1cecc2d7e16 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -264,9 +264,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -116,7 +116,7 @@ index c3e0b40a845a30790f31a0cf591bfa7f0cd87fee..be0d3ea564503441910aecdfe3d45b03
      public DataPackManager getDataPackManager();
  
      /**
-@@ -2226,5 +2228,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2232,5 +2234,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull
      com.destroystokyo.paper.entity.ai.MobGoals getMobGoals();
diff --git a/patches/api/0324-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/0324-Allow-delegation-to-vanilla-chunk-gen.patch
index e8f75d98e2..df4b25e905 100644
--- a/patches/api/0324-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/api/0324-Allow-delegation-to-vanilla-chunk-gen.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 8ca65a413295c1f104cc47f2f71cbc80345a9812..03a94d0b332f531832bfad9839ec60a2ad91222c 100644
+index 6ac4c0c6c2245e6bee9575ff4804994648112d78..3d0e5045f0d6bf3bee4a94e552a57d2b7d481c02 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2076,6 +2076,24 @@ public final class Bukkit {
+@@ -2082,6 +2082,24 @@ public final class Bukkit {
          return server.createChunkData(world);
      }
  
@@ -34,10 +34,10 @@ index 8ca65a413295c1f104cc47f2f71cbc80345a9812..03a94d0b332f531832bfad9839ec60a2
       * Creates a boss bar instance to display to players. The progress
       * defaults to 1.0
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index be0d3ea564503441910aecdfe3d45b0303facc19..a1a9ed907eaa89e2915855eb2946d27ef3521b61 100644
+index 052d0e420f2631ff925bb5df4a41a1cecc2d7e16..b4e520b82c026c62e5bd3840aa80cdc8d177b6f1 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1754,6 +1754,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1760,6 +1760,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      public ChunkGenerator.ChunkData createChunkData(@NotNull World world);
  
diff --git a/patches/api/0341-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/api/0341-API-for-creating-command-sender-which-forwards-feedb.patch
index 5c1c336819..b73fdc4cb4 100644
--- a/patches/api/0341-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/api/0341-API-for-creating-command-sender-which-forwards-feedb.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] API for creating command sender which forwards feedback
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 03a94d0b332f531832bfad9839ec60a2ad91222c..c64f6ccfcd08c851900e734a194b1de4c8e32b07 100644
+index 3d0e5045f0d6bf3bee4a94e552a57d2b7d481c02..f941836afda889d8824b1f89bfe9a66cf71ed2a0 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1565,6 +1565,20 @@ public final class Bukkit {
+@@ -1571,6 +1571,20 @@ public final class Bukkit {
          return server.getConsoleSender();
      }
  
@@ -30,10 +30,10 @@ index 03a94d0b332f531832bfad9839ec60a2ad91222c..c64f6ccfcd08c851900e734a194b1de4
       * Gets the folder that contains all of the various {@link World}s.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index a1a9ed907eaa89e2915855eb2946d27ef3521b61..d6c3fefbd407ae3aa1be9e71d05b6370f09dd905 100644
+index b4e520b82c026c62e5bd3840aa80cdc8d177b6f1..aee14b81d16c26c3c7e1c5849a829bfe012aa5fb 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1318,6 +1318,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1324,6 +1324,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      public ConsoleCommandSender getConsoleSender();
  
diff --git a/patches/api/0347-Custom-Potion-Mixes.patch b/patches/api/0347-Custom-Potion-Mixes.patch
index 3881038adb..e070ceabb2 100644
--- a/patches/api/0347-Custom-Potion-Mixes.patch
+++ b/patches/api/0347-Custom-Potion-Mixes.patch
@@ -155,10 +155,10 @@ index 0000000000000000000000000000000000000000..3ede1e8f7bf0436fdc5bf395c0f9eaf1
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index c64f6ccfcd08c851900e734a194b1de4c8e32b07..986d506ae0eb91363e7fdfa19b1f9d0d840a5207 100644
+index f941836afda889d8824b1f89bfe9a66cf71ed2a0..22ec7dda6853db6539e98e8d39d8a13be8926f07 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2598,6 +2598,15 @@ public final class Bukkit {
+@@ -2604,6 +2604,15 @@ public final class Bukkit {
      public static io.papermc.paper.datapack.DatapackManager getDatapackManager() {
          return server.getDatapackManager();
      }
@@ -175,10 +175,10 @@ index c64f6ccfcd08c851900e734a194b1de4c8e32b07..986d506ae0eb91363e7fdfa19b1f9d0d
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index d6c3fefbd407ae3aa1be9e71d05b6370f09dd905..33458df42b41e9ef5d9728d526cc45b8199f25b4 100644
+index aee14b81d16c26c3c7e1c5849a829bfe012aa5fb..96f9f3ac492eb6f4628d47f0be4239ab9bc7df54 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2262,5 +2262,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2268,5 +2268,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull
      io.papermc.paper.datapack.DatapackManager getDatapackManager();
diff --git a/patches/api/0411-Folia-scheduler-and-owned-region-API.patch b/patches/api/0411-Folia-scheduler-and-owned-region-API.patch
index 402fbd4d66..2913858508 100644
--- a/patches/api/0411-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/api/0411-Folia-scheduler-and-owned-region-API.patch
@@ -499,10 +499,10 @@ index 0000000000000000000000000000000000000000..a6b50c9d8af589cc4747e14d343d2045
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index da505ee90f49983a9458cdf371db32228791fb53..63a4f5cc3f2e8fbff47543de76e42a79996dbe81 100644
+index a24de4474114af533e1e8b78c4fd0e8c5edd14b8..010d7e8a831b32060a471ef877ac43ce237a7258 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2629,6 +2629,141 @@ public final class Bukkit {
+@@ -2635,6 +2635,141 @@ public final class Bukkit {
      }
      // Paper end
  
@@ -645,10 +645,10 @@ index da505ee90f49983a9458cdf371db32228791fb53..63a4f5cc3f2e8fbff47543de76e42a79
      public static Server.Spigot spigot() {
          return server.spigot();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index d433a9d2fe0bb487865fec33307cc4c45af475a0..f819de247080d58803a2851a4cab28d2b3765495 100644
+index c8704bc90a4f7040e5fa1c0377d5533bd14a4249..627913905269739e91c5007e372856e321cb9312 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2291,4 +2291,119 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2297,4 +2297,119 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull org.bukkit.potion.PotionBrewer getPotionBrewer();
      // Paper end
diff --git a/patches/api/0416-API-for-updating-recipes-on-clients.patch b/patches/api/0416-API-for-updating-recipes-on-clients.patch
index c1665b9ba0..0ab07c3ae5 100644
--- a/patches/api/0416-API-for-updating-recipes-on-clients.patch
+++ b/patches/api/0416-API-for-updating-recipes-on-clients.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] API for updating recipes on clients
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 63a4f5cc3f2e8fbff47543de76e42a79996dbe81..b82260cdee74a82b78c103467f7e2888ba4d06c1 100644
+index 010d7e8a831b32060a471ef877ac43ce237a7258..0865830a8d9f29dee47c34a192e26e4c1304a12c 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -990,6 +990,26 @@ public final class Bukkit {
@@ -35,7 +35,7 @@ index 63a4f5cc3f2e8fbff47543de76e42a79996dbe81..b82260cdee74a82b78c103467f7e2888
      /**
       * Returns the primary logger associated with this server instance.
       *
-@@ -1044,6 +1064,20 @@ public final class Bukkit {
+@@ -1050,6 +1070,20 @@ public final class Bukkit {
          return server.addRecipe(recipe);
      }
  
@@ -56,7 +56,7 @@ index 63a4f5cc3f2e8fbff47543de76e42a79996dbe81..b82260cdee74a82b78c103467f7e2888
      /**
       * Get a list of all recipes for a given item. The stack size is ignored
       * in comparisons. If the durability is -1, it will match any data value.
-@@ -1235,6 +1269,24 @@ public final class Bukkit {
+@@ -1241,6 +1275,24 @@ public final class Bukkit {
          return server.removeRecipe(key);
      }
  
@@ -82,7 +82,7 @@ index 63a4f5cc3f2e8fbff47543de76e42a79996dbe81..b82260cdee74a82b78c103467f7e2888
       * Gets a list of command aliases defined in the server properties.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index f819de247080d58803a2851a4cab28d2b3765495..f18f5db804053e072134508ef38252391895549a 100644
+index 627913905269739e91c5007e372856e321cb9312..bc55bf7361fb41a91766fcb2f1e4620e3db64781 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -836,6 +836,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -108,7 +108,7 @@ index f819de247080d58803a2851a4cab28d2b3765495..f18f5db804053e072134508ef3825239
      /**
       * Returns the primary logger associated with this server instance.
       *
-@@ -871,15 +887,34 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -877,15 +893,34 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      public boolean dispatchCommand(@NotNull CommandSender sender, @NotNull String commandLine) throws CommandException;
  
      /**
@@ -144,7 +144,7 @@ index f819de247080d58803a2851a4cab28d2b3765495..f18f5db804053e072134508ef3825239
      /**
       * Get a list of all recipes for a given item. The stack size is ignored
       * in comparisons. If the durability is -1, it will match any data value.
-@@ -1048,6 +1083,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1054,6 +1089,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      public boolean removeRecipe(@NotNull NamespacedKey key);
  
diff --git a/patches/api/0463-improve-BanList-types.patch b/patches/api/0463-improve-BanList-types.patch
index 4fe0de3900..f1738e1190 100644
--- a/patches/api/0463-improve-BanList-types.patch
+++ b/patches/api/0463-improve-BanList-types.patch
@@ -68,10 +68,10 @@ index a77c0411a68a9bad33ddfb335b7a996a843e478c..0e0baadde9e34d28db56dc68e66aaf66
          /**
           * Banned player names
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index ca27559cf4aa1c2e44fdca2022e213b1b1c80f4e..db46e3233edf18bd91a6da8612ccc9f0080d5c17 100644
+index 8e2942664f73b0f92beb30c7a94b720610a43c15..9a428153f34291bdc026a71f7e60e285b7794b0c 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1633,11 +1633,27 @@ public final class Bukkit {
+@@ -1639,11 +1639,27 @@ public final class Bukkit {
       * @param <T> The ban target
       *
       * @return a ban list of the specified type
@@ -100,10 +100,10 @@ index ca27559cf4aa1c2e44fdca2022e213b1b1c80f4e..db46e3233edf18bd91a6da8612ccc9f0
      /**
       * Gets a set containing all player operators.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index b4f8281d3797ec825a7671f38077cd65d5a1d76e..0eb61b090d6f8fa6d99735ff3680dac774c52c1f 100644
+index 78daaaa3b4f1ec1d05652287d9f9b08689bc2cbf..4ff1b38eb65f97344257204cf018f176f247ed36 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1394,10 +1394,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1400,10 +1400,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @param <T> The ban target
       *
       * @return a ban list of the specified type