Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@81619a6 Fix treasure map config default (#9572)
PaperMC/Paper@13c9d3c Bump net.kyori:ansi to 1.0.3 (#9575)
PaperMC/Paper@2c55dd8 Expand use of strict advancement dim check (#9545)
PaperMC/Paper@69a8013 [ci skip] Fix inventorycloseevent javadocs (#9533)
PaperMC/Paper@2fa8efc Updated Upstream (Bukkit/CraftBukkit) (#9485)
PaperMC/Paper@508a295 Only erase allay memory on non-item targets (#9570)
PaperMC/Paper@31358d5 API for updating recipes on clients (#6463)
PaperMC/Paper@8fe8ca6 Add clickable version on version command (#9347)
PaperMC/Paper@d6d2b6f Only capture actual tree growth (#6464)
PaperMC/Paper@5274ad6 Add and implement PlayerFailMoveEvent (#9535)
PaperMC/Paper@ef2b574 Clone location in PlayerFailMoveEvent getters
PaperMC/Paper@408a905 Don't put entities removed during the portal exit event into an invalid state
PaperMC/Paper@9ffccd6 Use correct source for mushroom block spread event (#9587)
PaperMC/Paper@93cf3eb Respect randomizeData on more entities when spawning (#9483)
PaperMC/Paper@a2002a7 Fix wild wolves not considering bones interesting (#9579)
PaperMC/Paper@98c567f Use correct seed on api world load (#9541)
PaperMC/Paper@4179b8f Remove UpgradeData neighbour ticks outside of range
PaperMC/Paper@9bc70e6 Make the cursor limit option apply to banners (#9554)
PaperMC/Paper@3c41f8f Cache map ids on item frames (#9584)
PaperMC/Paper@3b4839e Fix players are invisible after using setPlayerProfile (#9143)
PaperMC/Paper@20a71c5 Add restrict-player-reloot-time config (#7652)
PaperMC/Paper@29aaf7b Fix custom statistic criteria creation (#9595)
PaperMC/Paper@2df309b Bandaid fix for Effect (#9548)
PaperMC/Paper@1dfdbef SculkCatalyst bloom API (#9466)
PaperMC/Paper@02338e5 Fix DEFAULT getEntitySpawnReason for /summon (#9480)
PaperMC/Paper@23c44c2 [ci skip] Update README
PaperMC/Paper@93829bb Account for dimension type in portal void damage check (#9602)
PaperMC/Paper@a73ed95 Updated Upstream (CraftBukkit/Spigot) (#9598)

gradle.properties

@@ -3,7 +3,7 @@ version = 1.20.1-R0.1-SNAPSHOT
 
 mcVersion = 1.20.1
 packageVersion = 1_20_R1
-paperRef = f402f89a67bfdbcbe302733a0e62b064888b0f6f
+paperRef = a73ed9572e68f228c97e168be74fb357cf9115bf
 
 org.gradle.jvmargs = -Xmx2G
 

patches/api/0002-Add-CloudPlane-configuration.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add CloudPlane configuration
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 6b72eccdcb6f75534a4267a1dd0a4cc2f39e917b..14d87be45ac92e207369f9e596a52ac9c5abf68c 100644
+index 68206cf0178c26c0f528a1e14a5fb4e9ad410369..0cd39064429a17cdcb06cc598df46becdc52996c 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2030,6 +2030,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2081,6 +2081,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
          // Paper end
 

patches/server/0001-Pufferfish-server-patches.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Pufferfish server patches
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 57f2c414dbfe127c193002fbc8eeb22e94e9cb55..c6766a64f8f813f887d0d30754b2fdd0c8d6db11 100644
+index fb98936bb8a5488db75d676c5bcb4060597fbbf8..2d245d1470c3b1ff9bf3d791d19a82999e7d3efd 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -52,6 +52,14 @@ dependencies {
@@ -2217,7 +2217,7 @@ index 488a253e218409b5f0b4a872cee0928578fa7582..6e3b2863f04419ee6914ac3fd4f12a4f
 
      private void getFullChunk(long pos, Consumer<LevelChunk> chunkConsumer) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 81d0b2933040a451441f660f9e46199ae3b111e3..7021540b6d231fd954dc8b9114f4a513e891199c 100644
+index 196280f54e397c69d32bd4d1f6ae666efdd93773..ecc21cb6fc87b9c048b2b4027e54bd2ebddbc5e7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -181,6 +181,7 @@ public class ServerEntity {
@@ -2302,7 +2302,7 @@ index 18aac3da3c88f33b1a71a5920a8daa27e9723913..4267ff0c534932ae6327b280d0b82363
              this.getRandomBlockPosition(j, 0, k, 15, blockposition);
              int normalY = chunk.getHeight(Heightmap.Types.MOTION_BLOCKING, blockposition.getX() & 15, blockposition.getZ() & 15) + 1;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 9d46536f80b5b3e6641fd377c02166a431edfd77..8a1fde50b82a8b0718ae04124c2611b7cff4bcd6 100644
+index dc5fda83a66afbfeb7897fc20b4742899d8aca08..1f49a53033a6f7f0e70b655531f2fbb4117f687b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1245,6 +1245,7 @@ public class ServerPlayer extends Player {
@@ -2338,18 +2338,18 @@ index 9d46536f80b5b3e6641fd377c02166a431edfd77..8a1fde50b82a8b0718ae04124c2611b7
 
      @Override
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 316740b2ba4c85828f544249c8cdd6fa1b525d3f..22d2e0e262cbc9b0c95e9978adf5561df4774d25 100644
+index 80e050603e36134754136a8ee2bd14624f976e91..f2e71c26c889bdee2cd2b86dcde9d4c35a3574bd 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1219,6 +1219,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -1221,6 +1221,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
 
      @Override
      public void handleEditBook(ServerboundEditBookPacket packet) {
 +        if (!gg.pufferfish.pufferfish.PufferfishConfig.enableBooks && !this.player.getBukkitEntity().hasPermission("pufferfish.usebooks")) return; // Pufferfish
          // Paper start
          if (!this.cserver.isPrimaryThread()) {
              List<String> pageList = packet.getPages();
-@@ -2365,6 +2366,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2408,6 +2409,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      }
 
      private boolean updateChatOrder(Instant timestamp) {
@@ -2474,7 +2474,7 @@ index 04b1531572e8fff1e46fe1c94e7fc863841e0f66..3b8649e342b740cf16b2fc1dfecc280d
      int DEFAULT_DISTANCE_LIMIT = 8;
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 4c298406ce06d39f8279049270c88ec0830733b1..2c9fc0ac0e41a84cf23b1f11dc3d4eb4ed319947 100644
+index 2edab21bb271405f200de5a19e9c748bb14aba7d..bfe147385b92fc8822a851d770805747fdc83482 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -306,7 +306,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2563,7 +2563,7 @@ index 4c298406ce06d39f8279049270c88ec0830733b1..2c9fc0ac0e41a84cf23b1f11dc3d4eb4
          this.baseTick();
      }
 
-@@ -4288,16 +4323,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4293,16 +4328,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
 
      public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -2589,7 +2589,7 @@ index 4c298406ce06d39f8279049270c88ec0830733b1..2c9fc0ac0e41a84cf23b1f11dc3d4eb4
              double d1 = 0.0D;
              boolean flag = this.isPushedByFluid();
              boolean flag1 = false;
-@@ -4305,14 +4342,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4310,14 +4347,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              int k1 = 0;
              BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
 
@@ -2657,7 +2657,7 @@ index 4c298406ce06d39f8279049270c88ec0830733b1..2c9fc0ac0e41a84cf23b1f11dc3d4eb4
 
                              if (d2 >= axisalignedbb.minY) {
                                  flag1 = true;
-@@ -4334,9 +4418,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4339,9 +4423,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                                  // CraftBukkit end
                              }
                          }
@@ -4072,10 +4072,10 @@ index ebe65474a4a05ff1637d7f37ebcfe690af59def5..42142c512b12e5b269c19f1e821c50e7
 
      @Nullable
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a05c1bc8874ef5e380544a6a344c848e37da49c4..8a5a6842d7697d07bde9a282216677c5a9f32c00 100644
+index 249d76acac9a91cd46f0b8a477511974a75d6f4a..cc133e4eec67ec3aed27a4a5df1005e0556a643f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1139,6 +1139,11 @@ public final class CraftServer implements Server {
+@@ -1140,6 +1140,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/0002-Change-branding.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Change branding
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index c6766a64f8f813f887d0d30754b2fdd0c8d6db11..45972d692fbe4b4d887960b341b0b9060e050fea 100644
+index 2d245d1470c3b1ff9bf3d791d19a82999e7d3efd..ca6eebc3548eec8d821090278bfae27de12f30c6 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -13,8 +13,10 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@@ -118,10 +118,10 @@ index 3aff94cd3c825125bba334c003aa5c1085a7b4a8..4ab16edd644c1ae02f218debe79ea620
 
      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 8a5a6842d7697d07bde9a282216677c5a9f32c00..47c52266b435b5130bb2530c2c07c01a8904204b 100644
+index cc133e4eec67ec3aed27a4a5df1005e0556a643f..f51abd84df0f1befb4786c3513dfdc12f4ddb82a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -264,7 +264,7 @@ import javax.annotation.Nullable; // Paper
+@@ -265,7 +265,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
 
  public final class CraftServer implements Server {
@@ -131,7 +131,7 @@ index 8a5a6842d7697d07bde9a282216677c5a9f32c00..47c52266b435b5130bb2530c2c07c01a
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index daed278d1bcf84ee42749f24e311b22b70015d79..168130d0adbfd9b404182a234db8edb6705777d9 100644
+index 776b7fc26fe96b69be260bbd36efae147d988640..c191dffe3de45d66f067220ba7224dab4ed07550 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -292,7 +292,7 @@ public class Main {

patches/server/0003-Add-CloudPlane-configuration.patch

@@ -242,18 +242,18 @@ index 4c7dc6eb008fe4a5d521e40e6ff0798b612700fb..ac84f18bf9cf2251366b7e391bafba74
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 47c52266b435b5130bb2530c2c07c01a8904204b..7f9622a8a2b29a35b7698bbbc2a7fb023da088b2 100644
+index f51abd84df0f1befb4786c3513dfdc12f4ddb82a..9777fdcf0b0ed284a3eacb74b5deb1627b53ddd8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1056,6 +1056,7 @@ public final class CraftServer implements Server {
+@@ -1057,6 +1057,7 @@ public final class CraftServer implements Server {
 
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
 +        dev.booky.cloudplane.CloudPlaneConfig.init((File) console.options.valueOf("cloudplane-settings")); // CloudPlane
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
              world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -2869,6 +2870,13 @@ public final class CraftServer implements Server {
+@@ -2907,6 +2908,13 @@ public final class CraftServer implements Server {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
 
@@ -268,7 +268,7 @@ index 47c52266b435b5130bb2530c2c07c01a8904204b..7f9622a8a2b29a35b7698bbbc2a7fb02
          public void restart() {
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 168130d0adbfd9b404182a234db8edb6705777d9..64bbfa68c8fdf1d4e52698b15f28f41b1bd20072 100644
+index c191dffe3de45d66f067220ba7224dab4ed07550..1815345b756813cd19d80c909664199235086ee6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -173,6 +173,14 @@ public class Main {

patches/server/0006-Add-more-detailed-brand-info.patch

@@ -25,7 +25,7 @@ index b21f7a41581ddf36d61e206366c6398738a47813..9d3dafc4989b9fbaa32a337df9b3c56e
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index fff7ad7a45f310783ac96b44575ad3db13d537fa..76c42363fe207e688a50e69ff513401a922191c7 100644
+index 640e9bd618dc8286933318744c2064ede1fd9b5f..debb5b81412206e943548fe70a7cdccf37c333c4 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -288,7 +288,12 @@ public abstract class PlayerList {
@@ -43,10 +43,10 @@ index fff7ad7a45f310783ac96b44575ad3db13d537fa..76c42363fe207e688a50e69ff513401a
          playerconnection.send(new ClientboundPlayerAbilitiesPacket(player.getAbilities()));
          playerconnection.send(new ClientboundSetCarriedItemPacket(player.getInventory().selected));
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7f9622a8a2b29a35b7698bbbc2a7fb023da088b2..1989dd412b33395923ebe7fdd162a0b5b383ec24 100644
+index 9777fdcf0b0ed284a3eacb74b5deb1627b53ddd8..2644ba4d5d5af4c6200643de11010ccc0584e7ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -265,7 +265,7 @@ import javax.annotation.Nonnull; // Paper
+@@ -266,7 +266,7 @@ import javax.annotation.Nonnull; // Paper
 
  public final class CraftServer implements Server {
      private final String serverName = "CloudPlane"; // Paper // CloudPlane

patches/server/0015-Resend-more-data-on-locale-change.patch

@@ -27,7 +27,7 @@ index acc49f66bf34e2507d0ee6fec0a56b11bfc68f46..6ca487aaede00451628ff13615625054
          this.player = owner;
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 0163decb654acf86a0507e041dd5c6344ea58802..bd84cf5503248e72f797e548f1400592c87a27f8 100644
+index 670033bf5d72a12e44b76d55c4343de1490e873b..83adabab10c71f26d238625f2fa1d61749dbf322 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -320,6 +320,10 @@ public class ServerPlayer extends Player {
@@ -90,20 +90,20 @@ index 0163decb654acf86a0507e041dd5c6344ea58802..bd84cf5503248e72f797e548f1400592
          this.clientViewDistance = packet.viewDistance;
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/world/entity/Display.java b/src/main/java/net/minecraft/world/entity/Display.java
-index b7e77397c3c20d8112e17c8aed24e2186c1a72bc..b4ad94508334dcd7b993297379c521984c9ea355 100644
+index 2a5a4027e5d0d9d48a727834f3f5af65ea83aa23..ecef4ec4f67da8fdddd473733000b0002c65ff9f 100644
 --- a/src/main/java/net/minecraft/world/entity/Display.java
 +++ b/src/main/java/net/minecraft/world/entity/Display.java
-@@ -704,7 +704,7 @@ public abstract class Display extends Entity {
+@@ -593,7 +593,7 @@ public abstract class Display extends Entity {
          public static final byte FLAG_ALIGN_RIGHT = 16;
          private static final byte INITIAL_TEXT_OPACITY = -1;
          public static final int INITIAL_BACKGROUND = 1073741824;
 -        private static final EntityDataAccessor<Component> DATA_TEXT_ID = SynchedEntityData.defineId(Display.TextDisplay.class, EntityDataSerializers.COMPONENT);
 +        public static final EntityDataAccessor<Component> DATA_TEXT_ID = SynchedEntityData.defineId(Display.TextDisplay.class, EntityDataSerializers.COMPONENT); // CloudPlane - private -> public
-         private static final EntityDataAccessor<Integer> DATA_LINE_WIDTH_ID = SynchedEntityData.defineId(Display.TextDisplay.class, EntityDataSerializers.INT);
-         private static final EntityDataAccessor<Integer> DATA_BACKGROUND_COLOR_ID = SynchedEntityData.defineId(Display.TextDisplay.class, EntityDataSerializers.INT);
+         public static final EntityDataAccessor<Integer> DATA_LINE_WIDTH_ID = SynchedEntityData.defineId(Display.TextDisplay.class, EntityDataSerializers.INT);
+         public static final EntityDataAccessor<Integer> DATA_BACKGROUND_COLOR_ID = SynchedEntityData.defineId(Display.TextDisplay.class, EntityDataSerializers.INT);
          private static final EntityDataAccessor<Byte> DATA_TEXT_OPACITY_ID = SynchedEntityData.defineId(Display.TextDisplay.class, EntityDataSerializers.BYTE);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 53a3c45afadbdbbd5e2ef5b6602726ebe0523be0..9ddc4dc895347e8d06db8e2a5a121350bdc7445c 100644
+index e1aa3b24019eace573603647a5efbf01f316e4ee..e7dbb9f0c44a5b68274aca7210783ae2a39c541e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -355,7 +355,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {