Updated Upstream (Paper/Gale)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@78feecb Deprecate BlockType#isInteractable (#11427)
PaperMC/Paper@1cb2bf4 Add velocity forwarding secret env override (#10127)
PaperMC/Paper@81d9448 Add ItemStack array serialization methods (#10387)
PaperMC/Paper@2f50b87 Fixup command precprocess cancellation (#11424)
PaperMC/Paper@540deb7 Fix Color Particle API (#10895)
PaperMC/Paper@e8297c4 Expand out datapack API (#10828)
PaperMC/Paper@4514c71 Only call EntityPortalExitEvent if entity is actually in a portal
PaperMC/Paper@acdd6d3 make MenuType implement FeatureDependant
PaperMC/Paper@9b1ee0d Add missing key files and cleanup registry definition order
PaperMC/Paper@1bc02e6 Fix tag lifecycle event handlers not disabling /reload

Gale Changes:
Dreeam-qwq/Gale@7dbafa8 Updated Upstream (Paper)
Dreeam-qwq/Gale@030aa7e Updated Upstream (Paper)
Dreeam-qwq/Gale@6d51182 Updated Upstream (Paper)
Dreeam-qwq/Gale@669798b Updated Upstream (Paper)

gradle.properties

@@ -2,7 +2,7 @@ group = cn.dreeam.leaf
 mcVersion = 1.21.1
 version = 1.21.1-R0.1-SNAPSHOT
 
-galeCommit = 23d6c25bd1b63f31ab2dbddbadf60ac019d97128
+galeCommit = 669798b0f8ce4b64652ba8c2c17dabac94bb53ac
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/api/0004-Purpur-API-Changes.patch

@@ -1268,7 +1268,7 @@ index f1f97a85ec713c05c882d7588f4a3e4a017f4795..813f6cd253322538bdf96eb323dd23a7
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index b3abe3bde05d4a360e31e490bff8a859dc2bd4a6..9b8b958ce181b60eb5db89d4720380153152a2ac 100644
+index 7f63a3a37eb06049bd5de10466c6dd96cb5dd4ee..b6389b82b4eae033e1e770ae3967c88e950926ab 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -19,6 +19,17 @@ import org.bukkit.inventory.meta.ItemMeta;
@@ -1289,7 +1289,7 @@ index b3abe3bde05d4a360e31e490bff8a859dc2bd4a6..9b8b958ce181b60eb5db89d472038015
 
  /**
   * Represents a stack of items.
-@@ -1033,4 +1044,551 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -1120,4 +1131,551 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
          return Bukkit.getUnsafe().computeTooltipLines(this, tooltipContext, player);
      }
      // Paper end - expose itemstack tooltip lines

patches/server/0011-Purpur-Server-Changes.patch

@@ -1498,7 +1498,7 @@ index 8847873e5fc1fdf272d3acb84289a54efaa62b64..51c8d265f6c40b872efd7e03dccd162a
              try {
                  String channels = payload.toString(com.google.common.base.Charsets.UTF_8);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1816eea82d60e4433541a90c83825529301c6818..bde6f388ab0076114b8d81cc344fc88b40161d38 100644
+index fb8d5235c261c6128091e55141971e7e3e6ba671..7d9fc8cef93df986cf1d2edca63238a225f79aa7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -337,6 +337,20 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -1724,15 +1724,15 @@ index 1816eea82d60e4433541a90c83825529301c6818..bde6f388ab0076114b8d81cc344fc88b
                  org.bukkit.event.player.PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(this.player, Action.RIGHT_CLICK_AIR, itemstack, enumhand);
                  cancelled = event.useItemInHand() == Event.Result.DENY;
              } else {
-@@ -2789,6 +2867,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2797,6 +2875,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
              AABB axisalignedbb = entity.getBoundingBox();
 
              if (this.player.canInteractWithEntity(axisalignedbb, io.papermc.paper.configuration.GlobalConfiguration.get().misc.clientInteractionLeniencyDistance.or(1.0D))) { // Paper - configurable lenience value for interact range
 +                if (entity instanceof Mob mob) mob.ticksSinceLastInteraction = 0; // Purpur
                  packet.dispatch(new ServerboundInteractPacket.Handler() {
                      private void performInteraction(InteractionHand enumhand, ServerGamePacketListenerImpl.EntityInteraction playerconnection_a, PlayerInteractEntityEvent event) { // CraftBukkit
                          ItemStack itemstack = ServerGamePacketListenerImpl.this.player.getItemInHand(enumhand);
-@@ -2802,6 +2881,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2810,6 +2889,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
 
                              ServerGamePacketListenerImpl.this.cserver.getPluginManager().callEvent(event);
 
@@ -2097,7 +2097,7 @@ index f43bf280999ff3860cc702def50cc62b131eb1bd..66d9e99a351f5fc6cf58be3bee4397d9
      }
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 8d7d04483a8b7265b7c094e100c995062ef6d126..3f9c6f887763842fd25fe8e9b2352f7fd5e4b57c 100644
+index 0c5b0131df3e0a217c3422148c50e83ae8e80f07..983cef713678772bce715436471d3ef0cab5746f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -169,6 +169,7 @@ import org.bukkit.plugin.PluginManager;
@@ -2290,7 +2290,7 @@ index 8d7d04483a8b7265b7c094e100c995062ef6d126..3f9c6f887763842fd25fe8e9b2352f7f
      }
 
      public int getAirSupply() {
-@@ -3893,7 +3948,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3895,7 +3950,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      // CraftBukkit end
 
      public boolean canUsePortal(boolean allowVehicles) {
@@ -2299,7 +2299,7 @@ index 8d7d04483a8b7265b7c094e100c995062ef6d126..3f9c6f887763842fd25fe8e9b2352f7f
      }
 
      public boolean canChangeDimensions(Level from, Level to) {
-@@ -4215,6 +4270,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4217,6 +4272,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return SlotAccess.NULL;
      }
 
@@ -2320,7 +2320,7 @@ index 8d7d04483a8b7265b7c094e100c995062ef6d126..3f9c6f887763842fd25fe8e9b2352f7f
      @Override
      public void sendSystemMessage(Component message) {}
 
-@@ -4486,6 +4555,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4488,6 +4557,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return Mth.lerp(delta, this.yRotO, this.yRot);
      }
 
@@ -2333,7 +2333,7 @@ index 8d7d04483a8b7265b7c094e100c995062ef6d126..3f9c6f887763842fd25fe8e9b2352f7f
      public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
          if (false && this.touchingUnloadedChunk()) { // Gale - Airplane - reduce entity fluid lookups if no fluids - cost of a lookup here is the same cost as below, so skip
              return false;
-@@ -4897,7 +4972,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4899,7 +4974,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
 
      public float maxUpStep() {
@@ -2342,7 +2342,7 @@ index 8d7d04483a8b7265b7c094e100c995062ef6d126..3f9c6f887763842fd25fe8e9b2352f7f
      }
 
      public void onExplosionHit(@Nullable Entity entity) {}
-@@ -5089,4 +5164,44 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -5091,4 +5166,44 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
      }
      // Paper end - Expose entity id counter

patches/server/0065-Improve-Purpur-AFK-system.patch

@@ -57,7 +57,7 @@ index 7c6bda95b8b08cc70182f19cf0b991f78d28c235..79df52237b7a5822e0cbaff015ccd193
              } else {
                  getBukkitEntity().setPlayerListName(prefix + scoreboardName + suffix, true);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 33b2234970e3b78ccd4b8da184bbdd62b50d3afa..4cf8e0a2817795cc3c4ed30a0bf1199dd0e40c83 100644
+index e05558115e906cb9c059007d437bace31a60139e..a0c4b996dfda86057a37c7430bf37654ddebca23 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2276,6 +2276,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -140,7 +140,7 @@ index 33b2234970e3b78ccd4b8da184bbdd62b50d3afa..4cf8e0a2817795cc3c4ed30a0bf1199d
 +
          PlayerCommandPreprocessEvent event = new PlayerCommandPreprocessEvent(this.getCraftPlayer(), command, new LazyPlayerSet(this.server));
          this.cserver.getPluginManager().callEvent(event);
-
+         command = event.getMessage().substring(1);
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
 index f073b87e6b214e08672980f8f229cd436a742def..5d81f06c981128e4199555c1378345dccf4682b2 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java

patches/server/0096-Hide-specified-item-components-to-clients.patch

@@ -65,10 +65,10 @@ index 573c380e123473e35c0b72c44b32c8d6ba8e61c6..feacc41ecf7f4028e0a1cce5d2012ced
              }
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index df734f214ecfe798f1b9098e4a068d43ade5680c..b7b204d13663d8da9f0a05a3fcd7eb01860d0412 100644
+index 8c84f58c0d943f0a5abda490bcef8160b97b9b0f..db4a6be9d4494463471cb64034d1cf59ad489fd2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2955,7 +2955,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2963,7 +2963,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                                  entity.refreshEntityData(ServerGamePacketListenerImpl.this.player);
                                  // SPIGOT-7136 - Allays
                                  if (entity instanceof Allay || entity instanceof net.minecraft.world.entity.animal.horse.AbstractHorse) { // Paper - Fix horse armor desync