Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@934cd77 Lifecycle Event System (#9629)
PaperMC/Paper@534659e Fix NotNull locales (#10216)
PaperMC/Paper@9c04729 Add Arrow/Stinger Removal Time API (#10193)
PaperMC/Paper@69b52b4 Check for server JARs in plugin directory (#10228)
PaperMC/Paper@cbe62d9 Add Conduit API (#10195)
PaperMC/Paper@97c0120 Fix fox drops on death (#8862)
PaperMC/Paper@581fb30 itemstack expose tooltip lines (#10185)

patches/server/0102-Make-entity-breeding-times-configurable.patch

@@ -22,7 +22,7 @@ index 0cc411dd39d981187c9e9a3c5eb8043b19a09b98..f7032f4ea55f5aca293c2640686238b7
              // CraftBukkit end
              world.broadcastEntityEvent(entityvillager2, (byte) 12);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Animal.java b/src/main/java/net/minecraft/world/entity/animal/Animal.java
-index 0116f6057f7db02f9971698871bf893f2dee0939..8df8a48bd1dbbb4a6835f68bd700eac2b5acf91b 100644
+index d94928a78d166dd3d836261b4f99fb4f533019e7..a64ab2058d4e3439bf6ee418f3192b83c346eb85 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Animal.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Animal.java
 @@ -42,6 +42,7 @@ public abstract class Animal extends AgeableMob {
@@ -47,7 +47,7 @@ index 0116f6057f7db02f9971698871bf893f2dee0939..8df8a48bd1dbbb4a6835f68bd700eac2
          entityanimal.resetLove();
          worldserver.broadcastEntityEvent(this, (byte) 18);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index 9496bf72eb4cda6c2675daabe5ad82e90d12e173..6d3e16e9fb043d538b9c093fb79d092fce90d75a 100644
+index c1f71bf53dac227e6b8c6dbd88473fe79b6a2c64..2b69a3e860f95d4294dda8d05126f431eb7dd5b6 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
 @@ -483,6 +483,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
@@ -63,7 +63,7 @@ index 9496bf72eb4cda6c2675daabe5ad82e90d12e173..6d3e16e9fb043d538b9c093fb79d092f
      public int getRemainingPersistentAngerTime() {
          return (Integer) this.entityData.get(Bee.DATA_REMAINING_ANGER_TIME);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-index 87642c1c2c1f39a1c2029797bab73f60c19a1080..a5b1cc957b824f8cc36693128ce05f5d556cf7d7 100644
+index 83e715c9604efc9586171fd32c7cd2b339bc2349..cc665002c9aeaf9e5a0dbe83239757a544d0b976 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
 @@ -128,6 +128,11 @@ public class Cat extends TamableAnimal implements VariantHolder<CatVariant> {
@@ -111,7 +111,7 @@ index d42c8bcd85ffb1e00d2883485bf22981611b0bc3..c501704251e5b23f697efc307ebdc906
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index 88e26b2653eac1898f266b7c8f9f6e0fba422a52..fdab9a9ad76a0ad8f83ddbff278096637fd34a50 100644
+index 586d6453b45efc75b4c150707f9034576ad140e1..bc91862958fe18602d301f748ebeb73f65a4ee89 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
 @@ -188,6 +188,11 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
@@ -126,7 +126,7 @@ index 88e26b2653eac1898f266b7c8f9f6e0fba422a52..fdab9a9ad76a0ad8f83ddbff27809663
      @Override
      protected void defineSynchedData() {
          super.defineSynchedData();
-@@ -991,8 +996,10 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
+@@ -1003,8 +1008,10 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
                      CriteriaTriggers.BRED_ANIMALS.trigger(entityplayer2, this.animal, this.partner, entityfox);
                  }
  
@@ -140,7 +140,7 @@ index 88e26b2653eac1898f266b7c8f9f6e0fba422a52..fdab9a9ad76a0ad8f83ddbff27809663
                  this.partner.resetLove();
                  worldserver.addFreshEntityWithPassengers(entityfox, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.BREEDING); // CraftBukkit - added SpawnReason
 diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-index c58b3ff4e7e5dba4543a77c2c4d9bad3911fba98..db0170fb22ee8424c29fc0d4f3c93c9eac79611c 100644
+index e21fc50313052fe38ad54e5b44b3739c881ccd22..56427c987439c2d6d5652dae0f2c0a72d4eba26e 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
 @@ -85,6 +85,11 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
@@ -172,7 +172,7 @@ index 14daac1a87e32e0ff0a610aef256e20cbfe50001..3fe751839e4a1bc266b0d9508e1e3384
          return (Boolean) this.entityData.get(Ocelot.DATA_TRUSTING);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-index 6c7354ca03efdaf9e01d4a63f8ac38e74c0c35c8..0d5cc20029e1876b79927a89716e2ecc144791e3 100644
+index 846cbac0f862ec881347325dcd6db8eaedbd0e75..fe6323d131acc3885108d18f884a4c7d6d2f4905 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
 @@ -146,6 +146,11 @@ public class Panda extends Animal {
@@ -188,7 +188,7 @@ index 6c7354ca03efdaf9e01d4a63f8ac38e74c0c35c8..0d5cc20029e1876b79927a89716e2ecc
      public boolean canTakeItem(ItemStack stack) {
          EquipmentSlot enumitemslot = Mob.getEquipmentSlotForItem(stack);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Parrot.java b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
-index c3e8d3f2212a8e8d12e8d233c9d12463f8a44439..1bc595bb8b475aecdb106b53472678520621fcda 100644
+index 9334fb348e559ee27ba38bbd51c30876206c2af4..3bb216b678eee290a9ec636fe4d8af9db687405a 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
 @@ -198,6 +198,11 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
@@ -268,7 +268,7 @@ index 1d69558cccc6add5f02f1ff070c985bd5ec406c0..df7deec204ebf99afdbfe49f9a113857
      protected void registerGoals() {
          this.eatBlockGoal = new EatBlockGoal(this);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-index ee34cb8ee470c6ea4527ddca456d1b6d6f906f2c..f16b2d368ca247cad5764d11efa4fe754eadc6d6 100644
+index 3fcc57ed165203a36b35e121c2c0cc88ba5f73b8..0e2c4140f2772b7df3222343e17e3a973d3667a9 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 @@ -108,6 +108,11 @@ public class Turtle extends Animal {
@@ -284,7 +284,7 @@ index ee34cb8ee470c6ea4527ddca456d1b6d6f906f2c..f16b2d368ca247cad5764d11efa4fe75
          this.entityData.set(Turtle.HOME_POS, pos.immutable()); // Paper - called with mutablepos...
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-index eecdb1f1d49951cb8a294d176afd12c68fb6c3b1..39a923e48750bd960f64aad248c10dd390afc239 100644
+index b5c1efc1a67cdf163420b55e49baef9d78d9518f..ac184dce0f81ee0437111755c08e15c84b0dadff 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 @@ -132,6 +132,11 @@ public class Wolf extends TamableAnimal implements NeutralMob {
@@ -300,7 +300,7 @@ index eecdb1f1d49951cb8a294d176afd12c68fb6c3b1..39a923e48750bd960f64aad248c10dd3
      protected void registerGoals() {
          this.goalSelector.addGoal(1, new FloatGoal(this));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-index c7d9c34582b52d0bb088c624bd909ad5acb248fa..4e8f5d80949f251af2740f2e1ceee203783cc839 100644
+index 48b0df2acccd0d406ba05aaeb6dfbfde57cc1366..8bad919c44f7c4c4c524ea9ad5c8e38ab891bd08 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 @@ -120,6 +120,11 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
@@ -316,7 +316,7 @@ index c7d9c34582b52d0bb088c624bd909ad5acb248fa..4e8f5d80949f251af2740f2e1ceee203
      public Map<String, Vector3f> getModelRotationValues() {
          return this.modelRotationValues;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-index 909d32553ffd7a32f44f7201fdab850e4bcfdcc7..bfdd33beb8206c8b0c96aad5b5002c8db02ae912 100644
+index aace7991c198ccfe1338625e7b64b88921cefe0c..d1ada87d222e5b35c2df5a0e7b0075ec3413fa66 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
 @@ -91,6 +91,10 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
@@ -346,7 +346,7 @@ index 156fd7b01853f4ad50235646a15893bb03d631b2..3be70e054c658d34c4aa598ff70c63fa
      protected Brain.Provider<Frog> brainProvider() {
          return Brain.provider(MEMORY_TYPES, SENSOR_TYPES);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-index fef3b7d193d20c4fdd50b38c6a0371f05165a49d..93295d9683293121f2267350194f18e97b2421c2 100644
+index 961f808caa60aba70075572161bcb91cd7201008..0282498c7375a73b6982efb02f3cf3215f4211b0 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 @@ -109,6 +109,11 @@ public class Goat extends Animal {
@@ -394,7 +394,7 @@ index 92339f5a07dcb6bf7eb1bce6d584464ebd8430b5..0251ded48eb5bdf96f0e67f6456aa159
      protected void randomizeAttributes(RandomSource random) {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue((double)generateMaxHealth(random::nextInt));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-index 7b329fa3af99742d83eca7825e2da3b6e55431ee..6045f29c641d1958371c77701e9514d9ca44b85e 100644
+index b9b66f22ef39cb38bfb4dcbf4e73a0a7da596660..e11fc274f893d501235422839301a5128268199d 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 @@ -140,6 +140,11 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
@@ -474,7 +474,7 @@ index 4835950272c2a95cbcbfe3423bb83997ec6ee2c1..aaec706b7eaa6afdf7959e6dd53cc393
          return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0D).add(Attributes.MOVEMENT_SPEED, (double)0.2F);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-index a5fd822713b56ebb2bec51364be715570ec056bb..42bfc59462f320e95c13075c8541c4c4c98a6879 100644
+index 074835d3e315eb78d318e81c5fd04e5e786e9127..4d1071546f523c63b9c981e90a09393e9e4400fa 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
 @@ -113,6 +113,11 @@ public class Sniffer extends Animal {
@@ -506,7 +506,7 @@ index 9b853fd05a3a851cb08d7f849b51f2b220780982..10136a5062d154456c962e7d1a99c2de
          BlockPos.MutableBlockPos blockposition_mutableblockposition = pos.mutable();
  
 diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-index 22788892f7286f3fa6b40059b2bedaf0c6ec5ef3..80f91a11c04763c1c9ed2bd242b88b5a473560d7 100644
+index 9748b32692b14bffde1506e88149939c4ed25900..fae14f6ab139e7d7a0e8625488c472f0d0c1a1e2 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 @@ -91,6 +91,11 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {