Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@3885666 Remove stacktrace on exception from reading server.properties (#9296)
PaperMC/Paper@c1ea550 Remove more outdated config settings (#9358)
PaperMC/Paper@3a03739 Add method to get ungenerated chunk from long key (#9254)
PaperMC/Paper@072b78a Add trail ruins structure set seed in spigot config (#9327)
PaperMC/Paper@faf9a65 Disable BukkitMirrorTest
PaperMC/Paper@873533b Add method to remove all active potion effects (#9361)
PaperMC/Paper@275173e Updated Upstream (Bukkit/CraftBukkit)
PaperMC/Paper@976b95c Temp: Pre-init PlayerChunkLoaderData in order to prepopulate the BFS lookup cache because potatos (Closes #9338)
PaperMC/Paper@d6d4c78 Move some Folia API to Paper for easy compat (#9360)
PaperMC/Paper@b1fe756 Revert "Move some Folia API to Paper for easy compat (#9360)"
PaperMC/Paper@1f5bec7 Pull Folia API take two
PaperMC/Paper@3756f5b Properly Cancel Usable Items (#9225)

gradle.properties

@@ -5,4 +5,4 @@ org.gradle.vfs.watch=false
 group=gg.pufferfish.pufferfish
 version=1.20.1-R0.1-SNAPSHOT
 mcVersion=1.20.1
-paperRef=a226f44b452c8c75ca077b492ba4a957629ba489
+paperRef=3756f5bbf566fde4aa619bf8d4215f68567621d3

patches/server/0001-Pufferfish-branding.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Pufferfish branding
 Update branding
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 19186e436cd6a5f00f0b42ac11f8050ad2ef6713..677af5f1cf155c0ad7416c4395aa639c30f119b9 100644
+index 6d3d573ffc118e7f4d76422dc014a7df0384bb49..9418f84e7f62334f5f7a7310b80ea59f39abfee3 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -7,8 +7,12 @@ plugins {
@@ -204,10 +204,10 @@ index 0000000000000000000000000000000000000000..893d8c0946ef71a0561221dd76bffff0
 +}
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 80cf4852e4010eeeadaf920ab927a40df0179b40..93ae3063fe2b9117e646cf5758d576592a8e56b3 100644
+index 912affb0ab1c4c40f7a655194e95ec6f0ebf1fcd..db02a242ee7ad26e785c8a8d5e507d1d798ef60e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1679,7 +1679,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1691,7 +1691,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
      @DontObfuscate
      public String getServerModName() {
@@ -217,7 +217,7 @@ index 80cf4852e4010eeeadaf920ab927a40df0179b40..93ae3063fe2b9117e646cf5758d57659
 
      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 59984cb8ba9ffb66b59a2c907e4f04b5a51ea8ed..4c67480459a98639bfae19e143603fac8997f21a 100644
+index 0859f11567aecc8cae993a1409cfac7c53ab3dd5..91e71f405c639ad342c409e8ce0faa0a3a1888ff 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -261,7 +261,7 @@ import javax.annotation.Nullable; // Paper

patches/server/0003-Pufferfish-Config-and-Command.patch

@@ -5,12 +5,12 @@ Subject: [PATCH] Pufferfish Config and Command
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 677af5f1cf155c0ad7416c4395aa639c30f119b9..f549064c10c853f8210d3323409186750f60b8cb 100644
+index 9418f84e7f62334f5f7a7310b80ea59f39abfee3..9bbcb198af531a3f95d091ad2138f538e84372e1 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -48,6 +48,13 @@ dependencies {
-     runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10")
-     runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.10")
+     runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
+     runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
 
 +    // Pufferfish start
 +    implementation("org.yaml:snakeyaml:1.32")

patches/server/0007-Optimize-entity-coordinate-key.patch

@@ -24,10 +24,10 @@ index 2d11a67bdc82088abf0b3ca134f352f155c8eb1f..8bd24c8eef3169a765d42a6769034460
 
      public static long getCoordinateKey(final ChunkPos pair) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 92202262eff01ae3bbeff0e6ebdcf26ad613c169..57d10870ffa742cce811fccb2ca1aabea99f17c9 100644
+index 513c34aa02d63f7e3c178eade818e156af4541db..a992a9708fed700fe66992f0605b71edbb159088 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -294,7 +294,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -306,7 +306,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public double yo;
      public double zo;
      private Vec3 position;

patches/server/0017-Dynamic-Activation-of-Brain.patch

@@ -96,10 +96,10 @@ index 2cba34a6feb83cfb75e50be1b727b168be544fff..2931b2de14f98e974d6622ab8ed8cdd0
                      if (false && this.shouldDiscardEntity(entity)) { // CraftBukkit - We prevent spawning in general, so this butchering is not needed
                          entity.discard();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 57d10870ffa742cce811fccb2ca1aabea99f17c9..3c84ae70c6ff4eb9d493323f7a53c4607a9d388c 100644
+index a992a9708fed700fe66992f0605b71edbb159088..a5d29500a4d0571a18b5a879f72511c44fc2b61f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -421,6 +421,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -433,6 +433,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return this.originWorld;
      }
      // Paper end
@@ -362,7 +362,7 @@ index e30d5ae3e2900f43d7cafde71b8196f26e872841..c4ddf2661bca728d504918171295e10e
          if (this.assignProfessionWhenSpawned) {
              this.assignProfessionWhenSpawned = false;
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index d4da9ec6e00bb92b70598ee9a0d0ca5816562378..74696b4218ab39524d155cd9b0bf6c46a4aa46ab 100644
+index eda7f0bb42f7269676d5d2193e1155912ede9920..478622952b04293c237cdebd064c21a34bf25721 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -38,6 +38,10 @@ import co.aikar.timings.MinecraftTimings;

patches/server/0023-More-debug-for-plugins-not-shutting-down-tasks.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] More debug for plugins not shutting down tasks
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4c67480459a98639bfae19e143603fac8997f21a..c9ebcfffa6b958a117a2112ab181937dfcf48c1a 100644
+index 91e71f405c639ad342c409e8ce0faa0a3a1888ff..7036f8b170ce040accaa2fe637758c6695bdafe8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1066,6 +1066,11 @@ public final class CraftServer implements Server {
+@@ -1136,6 +1136,11 @@ public final class CraftServer implements Server {
                  plugin.getPluginMeta().getDisplayName(),
                  "This plugin is not properly shutting down its async tasks when it is being shut down. This task may throw errors during the final shutdown logs and might not complete before process dies."
              ));

patches/server/0026-Config-to-disable-method-profiler.patch

@@ -22,10 +22,10 @@ index 9ff0f60f03a532dabb8740ad5c44e068d5a9c8bf..03ef5e6b578aa1e9391e891d3e005b30
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f9a17b5c47ed41aca2093e49a38b36fa55213afa..55d5e325006d5a948b98451b1e455bb8bb869cbb 100644
+index 8d2ef2b6b38f239d0b7a5b6b4dda78e3871d4cc4..7f391d66796952e8af6b29b71cf3a91641aeacea 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2260,6 +2260,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2272,6 +2272,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
 
      public ProfilerFiller getProfiler() {

patches/server/0035-Remove-streams-from-getting-nearby-players.patch

@@ -7,10 +7,10 @@ This results in a 3% improvement at 20,000 entities, but more
 importantly is the heaviest part of the entity tracker currently.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3c84ae70c6ff4eb9d493323f7a53c4607a9d388c..5f23f0c18829053f6bfcb140e51a6421a5036d03 100644
+index a5d29500a4d0571a18b5a879f72511c44fc2b61f..a042706eaf157e7a70c6caaaf7e6daf633730562 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -500,17 +500,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -512,17 +512,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          this.isLegacyTrackingEntity = isLegacyTrackingEntity;
      }
 
@@ -48,7 +48,7 @@ index 3c84ae70c6ff4eb9d493323f7a53c4607a9d388c..5f23f0c18829053f6bfcb140e51a6421
          for (Entity passenger : passengers) {
              org.spigotmc.TrackingRange.TrackingRangeType passengerType = passenger.trackingRangeType;
              int passengerRange = chunkMap.getEntityTrackerRange(passengerType.ordinal());
-@@ -519,6 +538,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -531,6 +550,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  range = passengerRange;
              }
          }

patches/server/0038-Reduce-entity-allocations.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Reduce entity allocations
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5f23f0c18829053f6bfcb140e51a6421a5036d03..cb5808e25d2a2c91bb462feb7851f2775ada955b 100644
+index a042706eaf157e7a70c6caaaf7e6daf633730562..0a4be036630fda1571a19e4722f872d6fb905e76 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -424,6 +424,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -436,6 +436,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      // Pufferfish start
      public boolean activatedPriorityReset = false; // DAB
      public int activatedPriority = gg.pufferfish.pufferfish.PufferfishConfig.maximumActivationPrio; // golf score

patches/server/0040-Reduce-entity-fluid-lookups-if-no-fluids.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Reduce entity fluid lookups if no fluids
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index cb5808e25d2a2c91bb462feb7851f2775ada955b..d36cda3b1a121fb123b3a21e1e8e48bbf6f992ca 100644
+index 0a4be036630fda1571a19e4722f872d6fb905e76..3e8afc038a608ee98a26ea07899f33b3ac8cae15 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4321,16 +4321,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4334,16 +4334,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
 
      public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -34,7 +34,7 @@ index cb5808e25d2a2c91bb462feb7851f2775ada955b..d36cda3b1a121fb123b3a21e1e8e48bb
              double d1 = 0.0D;
              boolean flag = this.isPushedByFluid();
              boolean flag1 = false;
-@@ -4338,14 +4340,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4351,14 +4353,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              int k1 = 0;
              BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
 
@@ -102,7 +102,7 @@ index cb5808e25d2a2c91bb462feb7851f2775ada955b..d36cda3b1a121fb123b3a21e1e8e48bb
 
                              if (d2 >= axisalignedbb.minY) {
                                  flag1 = true;
-@@ -4367,9 +4416,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4380,9 +4429,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                                  // CraftBukkit end
                              }
                          }

patches/server/0042-Entity-TTL.patch

@@ -44,10 +44,10 @@ index ca7e0cd9e03d7d8fece1f81f684cec202389dc32..2925529336c6d080c4fe5283463f7dc3
      public static boolean throttleInactiveGoalSelectorTick;
  	private static void inactiveGoalSelectorThrottle() {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d36cda3b1a121fb123b3a21e1e8e48bbf6f992ca..245774d2d79646aac6fe7a8eac41b90aa5686f47 100644
+index 3e8afc038a608ee98a26ea07899f33b3ac8cae15..641c4af6bd13c87c26f7932dd5f6f4d2ee20e3c0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -825,6 +825,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -838,6 +838,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      // CraftBukkit end
 
      public void baseTick() {

patches/server/0043-Add-option-to-disable-out-of-order-chat.patch

@@ -21,10 +21,10 @@ index 2925529336c6d080c4fe5283463f7dc3b2a40738..d6ed2faae59d035cf96a3842d99b9b80
      }
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 95de55f688498547b95ecf146e98c3371d4ea3b3..29dbd3a902c2d620b9da191d0bcd9f6e9108034a 100644
+index f2c67ed5c888adca3e10fb2262c73fce23ceb8e9..309a3e42ec48a1a7684b62ea372bfa984df6a0fb 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2365,6 +2365,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2366,6 +2366,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      }
 
      private boolean updateChatOrder(Instant timestamp) {