Update upstream, merge Spellbook patches

gradle.properties

@@ -3,7 +3,7 @@ group=de.erethon.papyrus
 version = 1.21.1-R0.1-SNAPSHOT
 mcVersion = 1.21.1
 
-paperCommit = 2fdb2e9dcdfb127cb99134f9bec60dcc2a6954d2
+paperCommit = 1bc02e6b23bf18ba43054bf978769411bd96a04d
 
 org.gradle.jvmargs=-Xmx8G
 org.gradle.caching=true

patches/api/0003-Spellbook.patch

@@ -2006,7 +2006,7 @@ index 0000000000000000000000000000000000000000..8b72dba1a152833a89730155ff166328
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 5aa64ea39ebd92e5067c53cea49a8685c0b9eee4..389a9c0196d5588f2f3174ef1e373916cc89b765 100644
+index 6246251caf2c6f025c824b8e7a944b8d48751fa1..ce3aaca747a987d89894f44ea1bb3f94dd10526a 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -14,6 +14,7 @@ import java.util.Set;
@@ -2086,7 +2086,7 @@ index f89edd9c129802f70eac022ff6bf80bef378f5e8..a81d5720f19f15dcffdf346f5f8d4e23
       * Deals the given amount of damage to this entity from a specified
       * {@link DamageSource}.
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index fcdc5fce88720cc926a3953d80b5045113d1516c..b9ed36dc7dc67b9d045190ffb592fdbd87acbc52 100644
+index 68c08e7a212bc3e3885f9b5a4d9aef85fcb3b029..a6fbd5cd8a147df23e7cd514f58f2db2ba67b698 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -4,6 +4,9 @@ import java.util.Collection;
@@ -2108,15 +2108,15 @@ index fcdc5fce88720cc926a3953d80b5045113d1516c..b9ed36dc7dc67b9d045190ffb592fdbd
 
      /**
       * Gets the height of the living entity's eyes above its Location.
-@@ -1391,7 +1394,6 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1401,7 +1404,6 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @param slot the slot
       */
      void broadcastSlotBreak(org.bukkit.inventory.@NotNull EquipmentSlot slot);
 -
      /**
       * Notifies specified players that the item in the slot
       * of this entity broke.
-@@ -1458,4 +1460,6 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1468,4 +1470,6 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      boolean canUseEquipmentSlot(org.bukkit.inventory.@NotNull EquipmentSlot slot);
      // Paper end - Expose canUseSlot

patches/server/0001-Branding-changes.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Branding changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 421f6b3dc8890d63d2e7aa774d0bf8f7e15890ab..f687ca4a694468b18bbff5cb5fbd8e9608d24af2 100644
+index 648281575eb8d45a5c06549eb3d0f517c086fe64..65db3659e2720f019b2205c1887eb24cf16a5df5 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -13,7 +13,7 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@@ -46,10 +46,10 @@ index 421f6b3dc8890d63d2e7aa774d0bf8f7e15890ab..f687ca4a694468b18bbff5cb5fbd8e96
              "Git-Commit" to gitHash, // Paper
              "CraftBukkit-Package-Version" to paperweight.craftBukkitPackageVersion.get(), // Paper
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 23ddd26af762c1cd7fb3920669abb96b3213ab37..496c6f0b18bfe5093cea9501c80d1fe585e3a242 100644
+index 696d075ca2883f3c37e35f983c4d020e5db89d16..c7c5a3ad30ef62b7cd01f97a220b35e5b344ff75 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1942,7 +1942,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1940,7 +1940,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
      @DontObfuscate
      public String getServerModName() {
@@ -60,7 +60,7 @@ index 23ddd26af762c1cd7fb3920669abb96b3213ab37..496c6f0b18bfe5093cea9501c80d1fe5
 
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1b36e94617d4e777c419660936460d5cf8a4b3e8..b50175ef8e71b4075edc0e2b45b55db73dd05e9f 100644
+index b7af2d4300facf41a025c8ca322bf6541949b3ab..b5dd499fb11d70add7fa33dd72c20a704599fa6e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -266,7 +266,8 @@ import javax.annotation.Nullable; // Paper

patches/server/0002-misc-qol.patch

@@ -50,7 +50,7 @@ index 3e550f8e7cd4f4e16f499a8a2a4b95420270f07a..a5f9f2542af86ce95fb31887260fd88f
          if (connected && (InnerUtil.canSendImmediate(this, packet)
              || (io.papermc.paper.util.MCUtil.isMainThread() && packet.isReady() && this.pendingActions.isEmpty()
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6c280abdef5f80b668d6090f9d35283a33e21e0c..5203e3b0b2016a428c179a2a124ef4348d9705be 100644
+index c396580a9cfd86ff261bed439bb4662ae88010b5..abfbb33e0c0f64d3d21e9c1113f862a5db831b27 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -6,29 +6,11 @@ import com.mojang.datafixers.util.Either;
@@ -230,7 +230,7 @@ index 6c280abdef5f80b668d6090f9d35283a33e21e0c..5203e3b0b2016a428c179a2a124ef434
      public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile, ClientInformation clientOptions) {
          super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
          this.chatVisibility = ChatVisiblity.FULL;
-@@ -2943,3 +2878,4 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
+@@ -2947,3 +2882,4 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
      }
      // CraftBukkit end
  }