Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@a61d58d adjust ItemMeta to distinguish null and empty modifiers
PaperMC/Paper@6c02dbc handle recent ItemMeta changes in serialization logic
PaperMC/Paper@447f9a1 [ci skip] Fix paperclip PR label
PaperMC/Paper@b98d20a Brigadier Command Support (#8235)
PaperMC/Paper@ac554ad Updated Upstream (Bukkit/CraftBukkit) (#10691)
PaperMC/Paper@711f82e Fix signed book page serialization (#10696)
PaperMC/Paper@7e48f66 Properly pass requirement on namespaced redirects (#10701)
PaperMC/Paper@f041f48 Prevent infinite recursion on cyclic brig redirect (#10705)
PaperMC/Paper@11c3963 Improve Recipe validation (#10707)
PaperMC/Paper@0688f21 Better way to keep paper datapack enabled
PaperMC/Paper@218d33c fix creating complex recipes that have air results

build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     id("java-library")
-    id("io.papermc.paperweight.patcher") version "1.6.3"
+    id("io.papermc.paperweight.patcher") version "1.7.1"
 }
 
 repositories {

gradle.properties

@@ -3,7 +3,7 @@ version = 1.20.6-R0.1-SNAPSHOT
 
 mcVersion = 1.20.6
 packageVersion = 1_20_R4
-paperRef = cdb6ba8ef1fc609289e813fa1dcbe62ac610ed0d
+paperRef = 218d33ccb16a423c19c2040751a846c0314654ac
 
 org.gradle.jvmargs = -Xmx2G
 

patches/api/0001-Pufferfish-api-patches.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Pufferfish api patches
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 65e67b8726f1e19a6bcb1fe2f448e4ab68df11d1..c52e4d1caada3222298af4b9ca733c1e8fd0181d 100644
+index fd39ed209b20c927054b8482c400beeeeab460a3..ac88e0c9fdf01b58f69cf4d68ac1331dfe9dcb16 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -75,6 +75,8 @@ dependencies {
+@@ -76,6 +76,8 @@ dependencies {
      testImplementation("org.hamcrest:hamcrest:2.2")
      testImplementation("org.mockito:mockito-core:5.11.0")
      testImplementation("org.ow2.asm:asm-tree:9.7")
@@ -17,7 +17,7 @@ index 65e67b8726f1e19a6bcb1fe2f448e4ab68df11d1..c52e4d1caada3222298af4b9ca733c1e
  }
 
  // Paper start
-@@ -109,6 +111,13 @@ val generateApiVersioningFile by tasks.registering {
+@@ -130,6 +132,13 @@ val generateApiVersioningFile by tasks.registering {
      }
  }
 

patches/server/0002-Pufferfish-Server-Patches.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Pufferfish Server Patches
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 079bf6878538a1c223ac912f29f6df79a1167218..eb8744752b8d730142d15fab51ed889f1ec3efe8 100644
+index 87bb3fd9b97506f61734ae7f2e6860610ba794e7..a086d94ae1eaa351958074c3d2661f8795197829 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -47,6 +47,14 @@ dependencies {
+@@ -46,6 +46,14 @@ dependencies {
      runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
      runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
 
@@ -23,7 +23,7 @@ index 079bf6878538a1c223ac912f29f6df79a1167218..eb8744752b8d730142d15fab51ed889f
      testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
      testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
      testImplementation("org.hamcrest:hamcrest:2.2")
-@@ -67,6 +75,13 @@ paperweight {
+@@ -66,6 +74,13 @@ paperweight {
      craftBukkitPackageVersion.set("v1_20_R4") // also needs to be updated in MappingEnvironment
  }
 
@@ -2008,7 +2008,7 @@ index 300929a406905f5ff1ede664d5b99fb0938d4d2e..01a6b1135420ea659d092ddca499f281
                          throw new SignedMessageChain.DecodeException(SignedMessageChain.DecodeException.OUT_OF_ORDER_CHAT, org.bukkit.event.player.PlayerKickEvent.Cause.OUT_OF_ORDER_CHAT); // Paper - kick event causes
                      } else {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8dc2f9df367c849ca333bf1a1fd92ff91617b548..8bc8ae04837f1bd61f4efaf1f07a755adcf9687c 100644
+index 39303bb4e336732db0ab19dee0c1f8b609bbb134..d4807d574789c02c677911fcd05009988276c1cc 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -320,6 +320,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2020,7 +2020,7 @@ index 8dc2f9df367c849ca333bf1a1fd92ff91617b548..8bc8ae04837f1bd61f4efaf1f07a755a
      public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
          AtomicReference<S> atomicreference = new AtomicReference();
          Thread thread = new io.papermc.paper.util.TickThread(() -> { // Paper - rewrite chunk system
-@@ -2550,6 +2552,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2561,6 +2563,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
 
      public ProfilerFiller getProfiler() {
@@ -2029,19 +2029,19 @@ index 8dc2f9df367c849ca333bf1a1fd92ff91617b548..8bc8ae04837f1bd61f4efaf1f07a755a
      }
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index eb4fc900164d1fb3a78653ae8bc42ea30323f5b7..077c7507c87a120fb6e58dd07d343e6b0a82cfbf 100644
+index 2eb9c584cc77237f1c82d880a51a3f8b51008d73..6fb2a857d65d7b5de5fd8da224aa8dda79fe3505 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -234,6 +234,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -233,6 +233,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+         io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command
          com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
-         io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // Paper - init PaperBrigadierProvider
 +        gg.pufferfish.pufferfish.PufferfishConfig.load(); // Pufferfish
 +        gg.pufferfish.pufferfish.PufferfishCommand.init(); // Pufferfish
 
          this.setPvpAllowed(dedicatedserverproperties.pvp);
          this.setFlightAllowed(dedicatedserverproperties.allowFlight);
-@@ -354,6 +356,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -353,6 +355,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
                  DedicatedServer.LOGGER.info("JMX monitoring enabled");
              }
 
@@ -2304,7 +2304,7 @@ index ca56a0b596976448da6bb2a0e82b3d5cd4133e12..7ca499376cb2b2de2676601d2b9008d0
                  this.getRandomBlockPosition(j, 0, k, 15, blockposition);
                  this.tickPrecipitation(blockposition, chunk);
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 8437316888c6056060a2780652147590b6fe7443..856fc37dddaf0bf76f9f8396524488ac077f5bf8 100644
+index c10401e587a710d49c4af481c1e531b4bf51f755..5ca3726e411ce9c7facac63d35b974617def0272 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1330,6 +1330,7 @@ public class ServerPlayer extends Player {
@@ -2340,7 +2340,7 @@ index 8437316888c6056060a2780652147590b6fe7443..856fc37dddaf0bf76f9f8396524488ac
 
      @Override
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5e9202bc7fc649764568b55d66ba0d684118c00c..4064c15a6bb2d2c44475d3d0460c9d26d1f65b66 100644
+index b9b3277c8ed94e0cd30b20b9c00a33eaad48e5ac..c0e3f69b8c2b478c9879c19ed41664cfedd7c1a2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1154,6 +1154,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -2656,7 +2656,7 @@ index a46bf73c608641bf1f00fd55242de71a0f2ee06e..ba4b288e8db199ac31a1dbabd4cad522
          return (EntityType) Registry.register(BuiltInRegistries.ENTITY_TYPE, id, (EntityType<T>) type.build(id)); // CraftBukkit - decompile error
      }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 6e043457a29a890bcefd27fc5bb07c1a7e4e30f7..61ea7d42ca26f7f700b99c62020031d2a511b47e 100644
+index 517e10c3d8b1549cd30fd0e7cf2bcb35e88eb8ed..9bba1b16ec3a1d64ef5f41365fc7eab23050bb35 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -427,7 +427,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3954,10 +3954,10 @@ index 88a4a72bb390947dc17e5da09a99b2d1b3ac4621..d52b48181feca2ab9723a7342240bd51
 
      @Nullable
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 57db399bc1d3b6b015740b059987bc8d9bcc3101..300028987c6db9cdfbbf6d8efa5627586f293efd 100644
+index da1aed63af837b193900bb85393611edbd56c363..5f8e1584432ba16bf2954f6af16fef98cc3ff4ec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1138,6 +1138,11 @@ public final class CraftServer implements Server {
+@@ -1129,6 +1129,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/0003-Change-branding.patch

@@ -5,23 +5,19 @@ Subject: [PATCH] Change branding
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index d14a8dcfc343feda5fe1946fe3a45699f7b09a51..60c7ddf921ad3bce8999dcddcafd2d1a233dfed5 100644
+index a086d94ae1eaa351958074c3d2661f8795197829..8fbe5694def099212dbe9a68266bcd558c939fb0 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -12,8 +12,10 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
+@@ -12,7 +12,7 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
  val alsoShade: Configuration by configurations.creating
 
  dependencies {
 -    implementation(project(":paper-api"))
--    implementation(project(":paper-mojangapi"))
 +    implementation(project(":CloudPlane-API")) // CloudPlane
-+    implementation("io.papermc.paper:paper-mojangapi:1.20.1-R0.1-SNAPSHOT") { // CloudPlane
-+        exclude("io.papermc.paper", "paper-api") // CloudPlane
-+    } // CloudPlane
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.21.0")
      implementation("net.minecrell:terminalconsoleappender:1.3.0")
-@@ -94,7 +96,7 @@ tasks.jar {
+@@ -93,7 +93,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
@@ -105,10 +101,10 @@ index 9d687da5bdf398bb3f6c84cdf1249a7213d09f2e..b650f1f7390374dd50b0a281441d0ddb
                  org.bukkit.Bukkit.getLogger().warning("Version: " + org.bukkit.Bukkit.getBukkitVersion());
              }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8bc8ae04837f1bd61f4efaf1f07a755adcf9687c..9bd14340e4bfa91a2392ce724c0812b312e410c9 100644
+index d4807d574789c02c677911fcd05009988276c1cc..2eac9f11d59dccff6a361b609c21df447dd79550 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1926,7 +1926,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1928,7 +1928,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
      @DontObfuscate
      public String getServerModName() {
@@ -118,10 +114,10 @@ index 8bc8ae04837f1bd61f4efaf1f07a755adcf9687c..9bd14340e4bfa91a2392ce724c0812b3
 
      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 6b48e4caa325492bda9961e501cb8f2b5eb601f0..84413ced2617881c916be823ec3ea4fb862f92c6 100644
+index 5f8e1584432ba16bf2954f6af16fef98cc3ff4ec..da63843f68d26d8480bf59bdbf1f4652719da268 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -268,7 +268,7 @@ import javax.annotation.Nullable; // Paper
+@@ -269,7 +269,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
 
  public final class CraftServer implements Server {

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

@@ -213,11 +213,11 @@ index 0000000000000000000000000000000000000000..3d12a4fb9e6acb412d80bff777d08771
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 077c7507c87a120fb6e58dd07d343e6b0a82cfbf..315bcff697365903cb005e9987a00f7914dd9804 100644
+index 6fb2a857d65d7b5de5fd8da224aa8dda79fe3505..b69eeb58eb93869ed1637b7e98eededf14b13ced 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -236,6 +236,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // Paper - init PaperBrigadierProvider
+@@ -235,6 +235,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+         com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
          gg.pufferfish.pufferfish.PufferfishConfig.load(); // Pufferfish
          gg.pufferfish.pufferfish.PufferfishCommand.init(); // Pufferfish
 +        dev.booky.cloudplane.CloudPlaneConfig.init((java.io.File) this.options.valueOf("cloudplane-settings")); // CloudPlane - load configuration
@@ -242,18 +242,18 @@ index cd00bac90d289a770e5c2723b36462a3d7bda88f..535f000000a9670e07713deda82c2f47
          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 84413ced2617881c916be823ec3ea4fb862f92c6..3b39ac5f1838746a0661c8aeffb3e2147faae05f 100644
+index da63843f68d26d8480bf59bdbf1f4652719da268..e2fe625f77bf688c49e17b90cb14311f3b828f55 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1054,6 +1054,7 @@ public final class CraftServer implements Server {
+@@ -1038,6 +1038,7 @@ public final class CraftServer implements Server {
 
          org.spigotmc.SpigotConfig.init((File) this.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))
-@@ -3053,6 +3054,13 @@ public final class CraftServer implements Server {
+@@ -3044,6 +3045,13 @@ public final class CraftServer implements Server {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
 

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

@@ -43,10 +43,10 @@ index e4086bea596e5f5d71491e0b7ad650d76939b8f9..5676e34c9b1dacbbac6ea34eeeb78b95
          List<KnownPack> list = this.server.getResourceManager().listPacks().flatMap((iresourcepack) -> {
              return iresourcepack.location().knownPackInfo().stream();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8c0b010c76dac3f4d3ac01ef778dea113da89d8c..a665f2b0bfbe90e9a6a99350349b405885d66f0b 100644
+index e2fe625f77bf688c49e17b90cb14311f3b828f55..e47d373b7295fd3162427224432efe8e7b421972 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -269,7 +269,7 @@ import javax.annotation.Nonnull; // Paper
+@@ -270,7 +270,7 @@ import javax.annotation.Nonnull; // Paper
 
  public final class CraftServer implements Server {
      private final String serverName = "CloudPlane"; // Paper // CloudPlane

patches/server/0007-Add-start-argument-for-changing-pufferfish-config-lo.patch

@@ -33,13 +33,13 @@ index 25c02b42b69c9497fdd9e35e1e72a57f542a06ce..47778592eeab62163613211858ff5d11
  		if (configFile.exists()) {
  			try {
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 315bcff697365903cb005e9987a00f7914dd9804..0b6af867074f40cc1508f23d7bfc0e892d74aa0b 100644
+index b69eeb58eb93869ed1637b7e98eededf14b13ced..cabef25272c170e02ccea0151648726f8bb23248 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -234,7 +234,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -233,7 +233,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+         io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command
          com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
-         io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // Paper - init PaperBrigadierProvider
 -        gg.pufferfish.pufferfish.PufferfishConfig.load(); // Pufferfish
 +        gg.pufferfish.pufferfish.PufferfishConfig.load((java.io.File) options.valueOf("pufferfish-settings")); // Pufferfish // CloudPlane
          gg.pufferfish.pufferfish.PufferfishCommand.init(); // Pufferfish