Updated Upstream (Bukkit/CraftBukkit/Spigot)

Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 044d4ee SPIGOT-7283, SPIGOT-7318: Add AsyncStructureGenerateEvent and BlockState cloning 57b73d5 PR-913: Deprecate Projectile#doesBounce() and #setBounce() 43373c4 PR-904: Update FeatureFlag for 1.20.2 a7bbbf0 PR-911: Expand DataPack API with 1.20.2 pack version methods 0341e3a SPIGOT-7489: Add TeleportDuration to Display Entity bcd8d2a PR-912: Update Minecraft Wiki URLs CraftBukkit Changes: 99aafc2 Increase outdated build delay dab849f SPIGOT-7283, SPIGOT-7318: Add AsyncStructureGenerateEvent and BlockState cloning 041b29a Upgrade specialsource-maven-plugin 851a32c PR-1263: Remove unused implementation of AbstractProjectile#doesBounce() and #setBounce() 251af0d PR-1261: Expand DataPack API with 1.20.2 pack version methods 46e4ba6 Upgrade specialsource-maven-plugin df3738a SPIGOT-7489: Add TeleportDuration to Display Entity 8d0fea4 PR-1262: Update Minecraft Wiki URLs e62905a SPIGOT-7490: Fix entity equipment updates Spigot Changes: a0f3d486 Rebuild patches
PaperMC · Sep 29, 2023 · 4cdbb0c · 4cdbb0c
1 parent 1765917
commit 4cdbb0c
Show file tree

Hide file tree

Showing 125 changed files with 379 additions and 302 deletions.
diff --git a/patches/api/0005-Adventure.patch b/patches/api/0005-Adventure.patch
@@ -1476,7 +1476,7 @@ index ac5e263d737973af077e3406a84a84baca4370db..2d91924b7f5ef16a91d40cdc1bfc3d68
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 650adcecdca839518e0b57bc47935d010ca0f64f..fd0ae07b8a19f6b628601a487329a929f3a26c91 100644
+index 68194147e96307eca1147f3b2be5771270efb3d7..90b0253bd16a2b3c2ba3155f3eb9af35aab9f36f 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -25,6 +25,15 @@ import org.jetbrains.annotations.Nullable;

diff --git a/patches/api/0008-Paper-Plugins.patch b/patches/api/0008-Paper-Plugins.patch
@@ -1346,10 +1346,10 @@ index 0000000000000000000000000000000000000000..6bf3d212a6156ad9ab0e82d1ca0a04f8
 +
 +}
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index fd0ae07b8a19f6b628601a487329a929f3a26c91..2042e3fb0ea347148814d9838cd7bb475bd23984 100644
+index 90b0253bd16a2b3c2ba3155f3eb9af35aab9f36f..08b7e95f56d0454de57de492327542c36f46369d 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -101,4 +101,14 @@ public interface UnsafeValues {
+@@ -100,4 +100,14 @@ public interface UnsafeValues {
 
      @Nullable
      FeatureFlag getFeatureFlag(@NotNull NamespacedKey key);
@@ -1449,7 +1449,7 @@ index 94f8ceb965cecb5669a84a0ec61c0f706c2a2673..e773db6da357ad210eb24d4c389af2dc
      }
  }
 diff --git a/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java b/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java
-index 0eae1c027cab0444a125ae4efed7f9fcb1b9934f..07e8908d25fcd4e5eabadc9f019b54acff3b5e3c 100644
+index 539df5665a7cc1406a358fc435e36365b9c14068..32986df9a9854e561a77eefab99c934efbcb5aac 100644
 --- a/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java
 +++ b/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java
 @@ -197,7 +197,7 @@ import org.yaml.snakeyaml.representer.Representer;

diff --git a/patches/api/0010-Timings-v2.patch b/patches/api/0010-Timings-v2.patch
@@ -2897,7 +2897,7 @@ index e3602c6703b29ffec17ef7806c9deb3eead8a112..3e642d8a0294f7290c3d4310813e6e8a
           * Sends the component to the player
           *
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 2042e3fb0ea347148814d9838cd7bb475bd23984..f68ef89f37057cf677a767026ab395f7a839a2f9 100644
+index 08b7e95f56d0454de57de492327542c36f46369d..5d089d2fbbead69e744bb5a7dd172183e28d0eab 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -35,6 +35,7 @@ public interface UnsafeValues {
@@ -2908,7 +2908,7 @@ index 2042e3fb0ea347148814d9838cd7bb475bd23984..f68ef89f37057cf677a767026ab395f7
      Material toLegacy(Material material);
 
      Material fromLegacy(Material material);
-@@ -111,4 +112,12 @@ public interface UnsafeValues {
+@@ -110,4 +111,12 @@ public interface UnsafeValues {
          return !Bukkit.getUnsafe().isSupportedApiVersion(plugin.getDescription().getAPIVersion());
      }
      // Paper end

diff --git a/patches/api/0014-Version-Command-2.0.patch b/patches/api/0014-Version-Command-2.0.patch
@@ -56,10 +56,10 @@ index 0000000000000000000000000000000000000000..a736d7bcdc5861a01b66ba36158db1c7
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index f68ef89f37057cf677a767026ab395f7a839a2f9..a6aa33b9574d0278e10927007a62290e1d102e73 100644
+index 5d089d2fbbead69e744bb5a7dd172183e28d0eab..7ded4b932917a4a7b00b419e94a98aa8d59efe59 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -119,5 +119,12 @@ public interface UnsafeValues {
+@@ -118,5 +118,12 @@ public interface UnsafeValues {
       * @return name
       */
      String getTimingsServerName();

diff --git a/patches/api/0055-Fix-upstream-javadocs.patch b/patches/api/0055-Fix-upstream-javadocs.patch
@@ -74,32 +74,6 @@ index 0cf808356a1a5c6fc4bcf97a694ed9beb80a776a..dc765dea47a9a1c1520fb16ddb24f814
       * @param z Z-coordinate (0-15)
       * @return temperature at given coordinate
       */
-diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 0b6c1065751b4315b30f9710a18bbcd5620ef97c..8e04b99ee2152209d132c2b2e4228d5ddae9e339 100644
---- a/src/main/java/org/bukkit/Material.java
-+++ b/src/main/java/org/bukkit/Material.java
-@@ -7919,7 +7919,7 @@ public enum Material implements Keyed, Translatable {
-      *   <li>Only occluding blocks can be "powered" ({@link Block#isBlockPowered()}).
-      * </ul>
-      * This list may be inconclusive. For a full list of the side effects of an occluding
--     * block, see the <a href="https://minecraft.fandom.com/wiki/Opacity">Minecraft Wiki</a>.
-+     * block, see the <a href="https://minecraft.wiki/wiki/Opacity">Minecraft Wiki</a>.
-      *
-      * @return True if this material is a block and occludes light
-      */
-diff --git a/src/main/java/org/bukkit/MinecraftExperimental.java b/src/main/java/org/bukkit/MinecraftExperimental.java
-index 4e7e69219876eb6162f6e2cdf2ac3d242f7d75f6..41dbf018e26efe3624d78293aed7159cbd5dc123 100644
---- a/src/main/java/org/bukkit/MinecraftExperimental.java
-+++ b/src/main/java/org/bukkit/MinecraftExperimental.java
-@@ -9,7 +9,7 @@ import org.jetbrains.annotations.ApiStatus;
-
- /**
-  * Indicates that the annotated element (class, method, field, etc.) is part of a
-- * <a href="https://minecraft.fandom.com/wiki/Experimental_Gameplay">minecraft experimental feature</a>
-+ * <a href="https://minecraft.wiki/wiki/Experimental_Gameplay">minecraft experimental feature</a>
-  * and is subject to changes by Mojang.
-  * <p>
-  * <b>Note:</b> Elements marked with this annotation require the use of a datapack or otherwise
 diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java
 index 73b782c3975ad13159b6236976783fcfabd20493..e9cbbdf310e48011ee538c5592baee2535965fee 100644
 --- a/src/main/java/org/bukkit/Particle.java
@@ -534,19 +508,6 @@ index af5110b4160979c39cc1e5de6fa3bd7957b21403..15a0a733b0e5804655b5957cbf208312
       *
       * @param location the location to remove
       * @see #getExploredLocations()
-diff --git a/src/main/java/org/bukkit/entity/SpawnCategory.java b/src/main/java/org/bukkit/entity/SpawnCategory.java
-index a2772ada27a3d26be1a01a5389a57d8a6b7c54fe..87daa4cf7c92e193fb581ff941ac1243d81785d7 100644
---- a/src/main/java/org/bukkit/entity/SpawnCategory.java
-+++ b/src/main/java/org/bukkit/entity/SpawnCategory.java
-@@ -3,7 +3,7 @@ package org.bukkit.entity;
- /**
-  * Represents groups of entities with shared spawn behaviors and mob caps.
-  *
-- * @see <a href="https://minecraft.fandom.com/wiki/Spawn#Java_Edition_mob_cap">Minecraft Wiki</a>
-+ * @see <a href="https://minecraft.wiki/wiki/Spawn#Java_Edition_mob_cap">Minecraft Wiki</a>
-  */
- public enum SpawnCategory {
-
 diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
 index 6bf3af3ed81b66f61e53105d3591165ea74dba0e..a91400cd8bb4c72d1f3200a17f6de025540fe09d 100644
 --- a/src/main/java/org/bukkit/entity/Villager.java

diff --git a/patches/api/0152-Material-API-additions.patch b/patches/api/0152-Material-API-additions.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Material API additions
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 8e04b99ee2152209d132c2b2e4228d5ddae9e339..56de3e2c3a7e2de59e739b64004002689a0cf691 100644
+index 7ed67f356cf0ef8b3252256dcd4185f18573c989..d56d899ca7737b537ea55c13a384888a873f5da3 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
 @@ -118,6 +118,7 @@ import org.jetbrains.annotations.Nullable;

diff --git a/patches/api/0172-Fix-Spigot-annotation-mistakes.patch b/patches/api/0172-Fix-Spigot-annotation-mistakes.patch
@@ -90,7 +90,7 @@ index 8508aa2c6fb7c9f41f3d185f5228c86dd3b8b627..f7564581c18425c903e54f949728dd37
          if (this.world == null) {
              return null;
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 56de3e2c3a7e2de59e739b64004002689a0cf691..1e5116b7633e4a8607cf73100990ff952c1cce5f 100644
+index d56d899ca7737b537ea55c13a384888a873f5da3..cbec3b145a44ceee20823ae0e9c8162b15726189 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
 @@ -4468,11 +4468,11 @@ public enum Material implements Keyed, Translatable {
@@ -355,10 +355,10 @@ index be5baaf499cc76dd737d6203570e3d431c18afcf..c748679337989a7b4e2a39e542268b7f
      // Spigot end
 
 diff --git a/src/main/java/org/bukkit/block/BlockState.java b/src/main/java/org/bukkit/block/BlockState.java
-index 631cbf2be51040eee00aa39a39c5ec4003f91843..3147e278eac674ed21d714bbe318b135c0a6b408 100644
+index 7c5438fa92053cdbd7a01483a9baa4d48df07b24..a4f0a5270693e1c4af4fad827fa0a2ce753e07b5 100644
 --- a/src/main/java/org/bukkit/block/BlockState.java
 +++ b/src/main/java/org/bukkit/block/BlockState.java
-@@ -35,8 +35,10 @@ public interface BlockState extends Metadatable {
+@@ -36,8 +36,10 @@ public interface BlockState extends Metadatable {
       * Gets the metadata for this block state.
       *
       * @return block specific metadata
@@ -369,7 +369,7 @@ index 631cbf2be51040eee00aa39a39c5ec4003f91843..3147e278eac674ed21d714bbe318b135
      MaterialData getData();
 
      /**
-@@ -131,7 +133,9 @@ public interface BlockState extends Metadatable {
+@@ -141,7 +143,9 @@ public interface BlockState extends Metadatable {
       * Sets the metadata for this block state.
       *
       * @param data New block specific metadata
@@ -507,26 +507,24 @@ index 95c79c5fa0c4e30201f887da6467ce5f81c8a255..7f9c4d4b430a3f0276461346ff2621ba
 
      /**
 diff --git a/src/main/java/org/bukkit/entity/Projectile.java b/src/main/java/org/bukkit/entity/Projectile.java
-index c854860c13912f9a8707eb825cca23763d1323a6..a523fca4baab447181ef91df67fa69b24e010149 100644
+index 906b33b7569fff5dd78258f9765e879180a52834..06e3ad9cd8f39de0ef6ead794df1492415bc4302 100644
 --- a/src/main/java/org/bukkit/entity/Projectile.java
 +++ b/src/main/java/org/bukkit/entity/Projectile.java
-@@ -29,7 +29,9 @@ public interface Projectile extends Entity {
-      * If a small fireball does not bounce it will set the target on fire.
-      *
+@@ -29,7 +29,7 @@ public interface Projectile extends Entity {
       * @return true if it should bounce.
-+     * @deprecated Does not do anything
+      * @deprecated does not do anything
       */
-+    @Deprecated(forRemoval = true) // Paper
+-    @Deprecated
++    @Deprecated(forRemoval = true)
      public boolean doesBounce();
 
      /**
-@@ -37,6 +39,8 @@ public interface Projectile extends Entity {
-      * something.
-      *
+@@ -39,6 +39,6 @@ public interface Projectile extends Entity {
       * @param doesBounce whether or not it should bounce.
-+     * @deprecated Does not do anything
+      * @deprecated does not do anything
       */
-+    @Deprecated(forRemoval = true) // Paper
+-    @Deprecated
++    @Deprecated(forRemoval = true)
      public void setBounce(boolean doesBounce);
  }
 diff --git a/src/main/java/org/bukkit/entity/SplashPotion.java b/src/main/java/org/bukkit/entity/SplashPotion.java

diff --git a/patches/api/0188-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/api/0188-Add-Raw-Byte-ItemStack-Serialization.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add Raw Byte ItemStack Serialization
 Serializes using NBT which is safer for server data migrations than bukkits format.
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index a6aa33b9574d0278e10927007a62290e1d102e73..beddcb13a598d799c8ae1cec9c01c900e38b1458 100644
+index 7ded4b932917a4a7b00b419e94a98aa8d59efe59..27178f6eee7d60caa6ee864554b60092442c9002 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -126,5 +126,9 @@ public interface UnsafeValues {
+@@ -125,5 +125,9 @@ public interface UnsafeValues {
      default com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
          return new com.destroystokyo.paper.util.VersionFetcher.DummyVersionFetcher();
      }

diff --git a/patches/api/0211-Add-methods-to-get-translation-keys.patch b/patches/api/0211-Add-methods-to-get-translation-keys.patch
@@ -119,7 +119,7 @@ index 938c3217f92e6d3ef9a637269c469f8359af6347..ef49495909a37d718a87d5dfbcd644d4
 
      /**
 diff --git a/src/main/java/org/bukkit/GameRule.java b/src/main/java/org/bukkit/GameRule.java
-index 9443baf6de101a6d9af421314c013d8954798881..8108d6a82879e02384b83ab3f26b140e2ae2ed4c 100644
+index 3ac563da8c7d2ef70d46fc451a6752f6b1fc1d1e..695a299a3544547bbc24095980221205ce5469ba 100644
 --- a/src/main/java/org/bukkit/GameRule.java
 +++ b/src/main/java/org/bukkit/GameRule.java
 @@ -15,7 +15,7 @@ import org.jetbrains.annotations.Nullable;
@@ -144,7 +144,7 @@ index 9443baf6de101a6d9af421314c013d8954798881..8108d6a82879e02384b83ab3f26b140e
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 1e5116b7633e4a8607cf73100990ff952c1cce5f..a2d2981aff95d00c93130c139a5ab08edb05a7e1 100644
+index cbec3b145a44ceee20823ae0e9c8162b15726189..fdb36def5f2f4451b810624e0c3c04b4a0534528 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
 @@ -119,7 +119,7 @@ import org.jetbrains.annotations.Nullable;

diff --git a/patches/api/0214-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/api/0214-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Expose the Entity Counter to allow plugins to use valid and
 
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index beddcb13a598d799c8ae1cec9c01c900e38b1458..eabbe1cd18316948f70e7b56fb80827fdd3672f0 100644
+index 27178f6eee7d60caa6ee864554b60092442c9002..591cc561f6e60bcab3e45fd56f1a50e43e728f4c 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -130,5 +130,12 @@ public interface UnsafeValues {
+@@ -129,5 +129,12 @@ public interface UnsafeValues {
      byte[] serializeItem(ItemStack item);
 
      ItemStack deserializeItem(byte[] data);

diff --git a/patches/api/0259-Cache-the-result-of-Material-isBlock.patch b/patches/api/0259-Cache-the-result-of-Material-isBlock.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Cache the result of Material#isBlock
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index a2d2981aff95d00c93130c139a5ab08edb05a7e1..292e6d1ac000bff3ae4ce7a73a2010419086b9fc 100644
+index fdb36def5f2f4451b810624e0c3c04b4a0534528..74f9626b485aca594cdb9f11c363c6c38c78a661 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
 @@ -4397,6 +4397,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla

diff --git a/patches/api/0264-Expand-world-key-API.patch b/patches/api/0264-Expand-world-key-API.patch
@@ -78,10 +78,10 @@ index c8a312bf6cef6ba62114d4f46555f517f53c7576..2bfb1cfb4d669f4bb5a4ef540683bcee
       * Create a new virtual {@link WorldBorder}.
       * <p>
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index eabbe1cd18316948f70e7b56fb80827fdd3672f0..a00d93eee9710bb0fdf0fb791ef1a9262f89ef60 100644
+index 591cc561f6e60bcab3e45fd56f1a50e43e728f4c..1c07e3ef0b7bf3bc0bfe234434114cb6c2f18d42 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -137,5 +137,10 @@ public interface UnsafeValues {
+@@ -136,5 +136,10 @@ public interface UnsafeValues {
       * Use this when sending custom packets, so that there are no collisions on the client or server.
       */
      public int nextEntityId();
@@ -93,7 +93,7 @@ index eabbe1cd18316948f70e7b56fb80827fdd3672f0..a00d93eee9710bb0fdf0fb791ef1a926
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/WorldCreator.java b/src/main/java/org/bukkit/WorldCreator.java
-index cbe6b3a1ba7b04826d97c3558e8eb4e5ba11f92f..cbdcac688afb7c13dd7058fa522bbd2c5adc445e 100644
+index f9fa287d25a0243de8d8d7b0d13144ce919750b0..29f0bb4d5bb1d5ef1b6bd64726ca84c25091f9e4 100644
 --- a/src/main/java/org/bukkit/WorldCreator.java
 +++ b/src/main/java/org/bukkit/WorldCreator.java
 @@ -12,6 +12,7 @@ import org.jetbrains.annotations.Nullable;

diff --git a/patches/api/0265-Item-Rarity-API.patch b/patches/api/0265-Item-Rarity-API.patch
@@ -39,7 +39,7 @@ index 0000000000000000000000000000000000000000..74ef8395cc040ce488c2acaa416db202
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 292e6d1ac000bff3ae4ce7a73a2010419086b9fc..d350e9bd4437302ef050702f09452b7fc6bd7c2f 100644
+index 74f9626b485aca594cdb9f11c363c6c38c78a661..cfe35b0ca1f502c5c9af0d307bd22dcecc3b0f32 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
 @@ -4463,6 +4463,17 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
@@ -61,10 +61,10 @@ index 292e6d1ac000bff3ae4ce7a73a2010419086b9fc..d350e9bd4437302ef050702f09452b7f
 
      /**
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index a00d93eee9710bb0fdf0fb791ef1a9262f89ef60..f79784e1823f646181a434a6dbce3bac0eaf25c9 100644
+index 1c07e3ef0b7bf3bc0bfe234434114cb6c2f18d42..2c79e05db0b87599fcc650df3c81ed906ad3e76a 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -142,5 +142,22 @@ public interface UnsafeValues {
+@@ -141,5 +141,22 @@ public interface UnsafeValues {
       * Just don't use it.
       */
      @org.jetbrains.annotations.NotNull String getMainLevelName();

diff --git a/patches/api/0266-Expose-protocol-version.patch b/patches/api/0266-Expose-protocol-version.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose protocol version
 
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index f79784e1823f646181a434a6dbce3bac0eaf25c9..a27e14e00d759d6c15530ef038bcf4b5cbd9f120 100644
+index 2c79e05db0b87599fcc650df3c81ed906ad3e76a..664c0221566e48eb5c2fe5ce046608573e735b2a 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -159,5 +159,12 @@ public interface UnsafeValues {
+@@ -158,5 +158,12 @@ public interface UnsafeValues {
       * @return the itemstack rarity
       */
      public io.papermc.paper.inventory.ItemRarity getItemStackRarity(ItemStack itemStack);

diff --git a/patches/api/0282-Add-basic-Datapack-API.patch b/patches/api/0282-Add-basic-Datapack-API.patch
@@ -129,13 +129,13 @@ index 2bfb1cfb4d669f4bb5a4ef540683bcee409fc49e..156f014f94ed100d4d352a4ee5d0a2dc
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/packs/DataPack.java b/src/main/java/org/bukkit/packs/DataPack.java
-index e424680e54fb18e836f580d199e527532345380c..61b50774b4965e55efeb49143d86300c1c260a17 100644
+index 3d5af25a399589f1bdf95b77f584ae0ae5c26f02..ab512c7ee9d2442055b719d02d0d0ecc7ea8d992 100644
 --- a/src/main/java/org/bukkit/packs/DataPack.java
 +++ b/src/main/java/org/bukkit/packs/DataPack.java
-@@ -8,8 +8,10 @@ import org.jetbrains.annotations.NotNull;
-
- /**
+@@ -10,8 +10,10 @@ import org.jetbrains.annotations.NotNull;
   * Represents a data pack.
+  *
+  * @see <a href="https://minecraft.wiki/w/Data_pack">Minecraft wiki</a>
 + * @deprecated use {@link io.papermc.paper.datapack.Datapack}
   */
  @ApiStatus.Experimental

diff --git a/patches/api/0284-ItemStack-repair-check-API.patch b/patches/api/0284-ItemStack-repair-check-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] ItemStack repair check API
 
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index a27e14e00d759d6c15530ef038bcf4b5cbd9f120..00e61ab3103c86c9aabcdfa2fd4c565adcc091da 100644
+index 664c0221566e48eb5c2fe5ce046608573e735b2a..edc9b1ec665a57d9e4954c8409b1a42b29118b8c 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -160,6 +160,16 @@ public interface UnsafeValues {
+@@ -159,6 +159,16 @@ public interface UnsafeValues {
       */
      public io.papermc.paper.inventory.ItemRarity getItemStackRarity(ItemStack itemStack);
 

diff --git a/patches/api/0289-Attributes-API-for-item-defaults.patch b/patches/api/0289-Attributes-API-for-item-defaults.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Attributes API for item defaults
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index d350e9bd4437302ef050702f09452b7fc6bd7c2f..99a9c2f8b45f3c7339588b5a256598acf1f3be12 100644
+index cfe35b0ca1f502c5c9af0d307bd22dcecc3b0f32..9be00bc616b1c6ad9619d9a48d5870f6d7ffb917 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
 @@ -4474,6 +4474,21 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
@@ -31,10 +31,10 @@ index d350e9bd4437302ef050702f09452b7fc6bd7c2f..99a9c2f8b45f3c7339588b5a256598ac
 
      /**
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 00e61ab3103c86c9aabcdfa2fd4c565adcc091da..a9e7c64e1f98ff73c1804466d7c79eaf343dde7c 100644
+index edc9b1ec665a57d9e4954c8409b1a42b29118b8c..d30cdfece8d324fb95c96c156974317450518274 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -170,6 +170,18 @@ public interface UnsafeValues {
+@@ -169,6 +169,18 @@ public interface UnsafeValues {
       */
      public boolean isValidRepairItemStack(@org.jetbrains.annotations.NotNull ItemStack itemToBeRepaired, @org.jetbrains.annotations.NotNull ItemStack repairMaterial);