Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@bae6096 Re-add dropped patch during 1.20 update (#9344)
PaperMC/Paper@8bc0574 Bump kyori's ansi to fix color bleed (#9346)
PaperMC/Paper@f7b386d Use ANSI serializer for console completion descriptions (#9351)
PaperMC/Paper@41e6f20 Updated Upstream (Bukkit/CraftBukkit) (#9342)
PaperMC/Paper@b134eb4 Fix incorrect annotation on BrushableBlock#getItem (#9345)
PaperMC/Paper@fa674f3 Don't enforce icanhasbukkit default if alias block exists (#9334)
PaperMC/Paper@81834ac Updated Upstream (Bukkit/CraftBukkit/Spigot)
PaperMC/Paper@f6139de Fix sniffer removeExploredLocation and javadoc (#9311)
PaperMC/Paper@17966dd Update the server logo (#9264)
PaperMC/Paper@02e3b5a chore(api): add missing javadoc urls (#9355)
PaperMC/Paper@3f237e8 Fix IntegerUtil#getDivisorNumbers
PaperMC/Paper@f555138 Make sure to post process chunks before they are sent to players
PaperMC/Paper@a226f44 Copy itemstack when sanitizing for datawatcher items

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=837cc25c51cfcf630d61c2f6da38d00413a29ae4
+paperRef=a226f44b452c8c75ca077b492ba4a957629ba489

patches/api/0001-Add-Sentry.patch

@@ -5,13 +5,13 @@ Subject: [PATCH] Add Sentry
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 4b2330bac734cd07f8798ceeb6d9c67bd3f3521d..8a0bc0f6fa5ece0bbe44adc6b7c1326f8cc86e5e 100644
+index fb47a794893d5fef026a35a7c573becf74420aa0..307461526c15921d5e3fbcec63a0014b82e58850 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -44,6 +44,7 @@ dependencies {
+@@ -46,6 +46,7 @@ dependencies {
      apiAndDocs("net.kyori:adventure-text-logger-slf4j")
-     api("org.apache.logging.log4j:log4j-api:2.17.1")
-     api("org.slf4j:slf4j-api:1.8.0-beta4")
+     api("org.apache.logging.log4j:log4j-api:$log4jVersion")
+     api("org.slf4j:slf4j-api:$slf4jVersion")
 +    api("io.sentry:sentry:5.4.0") // Pufferfish
 
      implementation("org.ow2.asm:asm:9.4")

patches/api/0004-Add-SIMD-utilities.patch

@@ -8,10 +8,10 @@ and API spec stability is NOT guaranteed. If you use this in plugins,
 they WILL break eventually.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 8a0bc0f6fa5ece0bbe44adc6b7c1326f8cc86e5e..1efb8043c5bd734643a91f29a338dd8256579f3d 100644
+index 307461526c15921d5e3fbcec63a0014b82e58850..0330a20576c372c29ca4d98a2bc5b01e28303ac3 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -88,6 +88,13 @@ val generateApiVersioningFile by tasks.registering {
+@@ -90,6 +90,13 @@ val generateApiVersioningFile by tasks.registering {
      }
  }
 

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 a0c5592530d2a59bfde87d1e9eb3752e7d4694da..3a78b720c426510bb9f485355f41671ab7a4e8d7 100644
+index 19186e436cd6a5f00f0b42ac11f8050ad2ef6713..677af5f1cf155c0ad7416c4395aa639c30f119b9 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -7,8 +7,12 @@ plugins {
@@ -24,7 +24,7 @@ index a0c5592530d2a59bfde87d1e9eb3752e7d4694da..3a78b720c426510bb9f485355f41671a
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.21.0")
      implementation("net.minecrell:terminalconsoleappender:1.3.0")
-@@ -63,7 +67,7 @@ tasks.jar {
+@@ -64,7 +68,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
@@ -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 9f8c5ceb8485b14a84f2a7b2ffc8192be5c6bdfd..ef2530b297fedc42ad1c2a847922549a2a12ffb9 100644
+index 59984cb8ba9ffb66b59a2c907e4f04b5a51ea8ed..4c67480459a98639bfae19e143603fac8997f21a 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,10 +5,10 @@ Subject: [PATCH] Pufferfish Config and Command
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 3a78b720c426510bb9f485355f41671ab7a4e8d7..5043d2f637011cf5453b91e26e0e6b6b30272843 100644
+index 677af5f1cf155c0ad7416c4395aa639c30f119b9..f549064c10c853f8210d3323409186750f60b8cb 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -47,6 +47,13 @@ dependencies {
+@@ -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")
 

patches/server/0004-Add-SIMD-utilities.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add SIMD utilities
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index e0e116e7d1dc12286dd25542ab75a36be5b43e4f..dbd64648b8afba519733601b137e44e5a0634eb9 100644
+index f549064c10c853f8210d3323409186750f60b8cb..db418d96f8eee731b9ed29e51cb7ac0ff1ad529b 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -62,6 +62,14 @@ dependencies {
+@@ -63,6 +63,14 @@ dependencies {
  }
 
  val craftbukkitPackageVersion = "1_20_R1" // Paper

patches/server/0020-Flare-Profiler.patch

@@ -20,10 +20,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index dbd64648b8afba519733601b137e44e5a0634eb9..3d73b96ba360d85c6a72d53ec85d86bee8cdf72c 100644
+index db418d96f8eee731b9ed29e51cb7ac0ff1ad529b..0668648a49be0a999e739ddad66e6e101f166598 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -53,6 +53,7 @@ dependencies {
+@@ -54,6 +54,7 @@ dependencies {
          exclude(group="org.yaml", module="snakeyaml")
      }
      // Pufferfish end

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 b9c6c736987305b9f5020db9308e996bd34ba903..0b1743dc90bb9ca6cd86f0961108e3b8185ef094 100644
+index 4c67480459a98639bfae19e143603fac8997f21a..c9ebcfffa6b958a117a2112ab181937dfcf48c1a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1062,6 +1062,11 @@ public final class CraftServer implements Server {
+@@ -1066,6 +1066,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."
              ));