Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@fa8a407 Remove Adventure snapshot repo from dev bundle (#10716)
PaperMC/Paper@bebcc9c Make exception during command conversion non-fatal
PaperMC/Paper@2faa3b2 Correctly copy alias requirements in command upgrader
PaperMC/Paper@3fc9358 Show stacktrace when modifyItemStack fails
PaperMC/Paper@f175193 Expose server build information (#10729)

gradle.properties

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

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 87bb3fd9b97506f61734ae7f2e6860610ba794e7..a086d94ae1eaa351958074c3d2661f8795197829 100644
+index 4998aff0b7cb084dcda15c6a18bbe45e99b6000a..a5dd317a230d6ccaee8a492df909615b7e516d87 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -46,6 +46,14 @@ dependencies {
+@@ -47,6 +47,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 87bb3fd9b97506f61734ae7f2e6860610ba794e7..a086d94ae1eaa351958074c3d2661f87
      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")
-@@ -66,6 +74,13 @@ paperweight {
+@@ -67,6 +75,13 @@ paperweight {
      craftBukkitPackageVersion.set("v1_20_R4") // also needs to be updated in MappingEnvironment
  }
 
@@ -2008,10 +2008,10 @@ 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 39303bb4e336732db0ab19dee0c1f8b609bbb134..d4807d574789c02c677911fcd05009988276c1cc 100644
+index dbc86b8d4d2af6e5f7e678f2bb77fd39b85c04c5..a1e18fa1eb40199bc4414ace8f87f31a08012848 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
+@@ -317,6 +317,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public volatile boolean abnormalExit = false; // Paper
      public static final long SERVER_INIT = System.nanoTime(); // Paper - Lag compensation
 
@@ -2020,7 +2020,7 @@ index 39303bb4e336732db0ab19dee0c1f8b609bbb134..d4807d574789c02c677911fcd0500998
      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
-@@ -2561,6 +2563,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2558,6 +2560,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
 
      public ProfilerFiller getProfiler() {
@@ -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 da1aed63af837b193900bb85393611edbd56c363..5f8e1584432ba16bf2954f6af16fef98cc3ff4ec 100644
+index 2fa5507aa2153a05208077f9547c165a1099b5bb..978f29a76af86e3e1397551d79cdec4fecec071a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1129,6 +1129,11 @@ public final class CraftServer implements Server {
+@@ -1124,6 +1124,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,10 +5,10 @@ Subject: [PATCH] Change branding
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index a086d94ae1eaa351958074c3d2661f8795197829..8fbe5694def099212dbe9a68266bcd558c939fb0 100644
+index a5dd317a230d6ccaee8a492df909615b7e516d87..ad19b751573953d902d2b361335396cfd27223a4 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -12,7 +12,7 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
+@@ -13,7 +13,7 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
  val alsoShade: Configuration by configurations.creating
 
  dependencies {
@@ -17,15 +17,17 @@ index a086d94ae1eaa351958074c3d2661f8795197829..8fbe5694def099212dbe9a68266bcd55
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.21.0")
      implementation("net.minecrell:terminalconsoleappender:1.3.0")
-@@ -93,7 +93,7 @@ tasks.jar {
-         attributes(
-             "Main-Class" to "org.bukkit.craftbukkit.Main",
-             "Implementation-Title" to "CraftBukkit",
--            "Implementation-Version" to "git-Paper-$implementationVersion",
-+            "Implementation-Version" to "git-CloudPlane-$implementationVersion", // CloudPlane
-             "Implementation-Vendor" to date, // Paper
-             "Specification-Title" to "Bukkit",
+@@ -101,8 +101,8 @@ tasks.jar {
+             "Specification-Title" to "Paper",
              "Specification-Version" to project.version,
+             "Specification-Vendor" to "Paper Team",
+-            "Brand-Id" to "papermc:paper",
+-            "Brand-Name" to "Paper",
++            "Brand-Id" to "cloudcraft:cloudplane", // CloudPlane
++            "Brand-Name" to "CloudPlane", // CloudPlane
+             "Build-Number" to (build ?: ""),
+             "Build-Time" to Instant.now().toString(),
+             "Git-Branch" to gitBranch, // Paper
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
 index b35a9f4c5f8960864c402ede8a51fb5ab9c4fcc0..577b5f42ca47763c2604795724f906e00e1ddc7e 100644
 --- a/src/main/java/co/aikar/timings/TimingsExport.java
@@ -68,74 +70,37 @@ index 4b002e8b75d117b726b0de274a76d3596fce015b..111dcc7284166e7d5e7014ecf00df48a
                  metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
                      Map<String, Map<String, Integer>> map = new HashMap<>();
 diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-index 9d687da5bdf398bb3f6c84cdf1249a7213d09f2e..b650f1f7390374dd50b0a281441d0ddb930879f8 100644
+index 532306cacd52579cdf37e4aca25887b1ed3ba6a1..8735c0b8e599d226d4a2d9ae15e18a903b73e422 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-@@ -20,7 +20,7 @@ import java.util.stream.StreamSupport;
- public class PaperVersionFetcher implements VersionFetcher {
-     private static final java.util.regex.Pattern VER_PATTERN = java.util.regex.Pattern.compile("^([0-9\\.]*)\\-.*R"); // R is an anchor, will always give '-R' at end
-     private static final String GITHUB_BRANCH_NAME = "master";
+@@ -35,7 +35,7 @@ public class PaperVersionFetcher implements VersionFetcher {
+     private static final Logger LOGGER = LogUtils.getClassLogger();
+     private static final int DISTANCE_ERROR = -1;
+     private static final int DISTANCE_UNKNOWN = -2;
 -    private static final String DOWNLOAD_PAGE = "https://papermc.io/downloads/paper";
-+    private static final String DOWNLOAD_PAGE = "https://nightly.link/CloudCraftProjects/CloudPlane/workflows/build/master/CloudPlane-Artifacts.zip"; // CloudPlane
-     private static @Nullable String mcVer;
++    private static final String DOWNLOAD_PAGE = "https://dl.cloudcraftmc.de/r/cloudplane"; // CloudPlane
 
      @Override
-@@ -31,8 +31,8 @@ public class PaperVersionFetcher implements VersionFetcher {
-     @Nonnull
-     @Override
-     public Component getVersionMessage(@Nonnull String serverVersion) {
--        String[] parts = serverVersion.substring("git-Paper-".length()).split("[-\\s]");
--        final Component updateMessage = getUpdateStatusMessage("PaperMC/Paper", GITHUB_BRANCH_NAME, parts[0]);
-+        String[] parts = serverVersion.substring("git-CloudPlane-".length()).split("[-\\s]"); // CloudPlane
-+        final Component updateMessage = getUpdateStatusMessage("CloudCraftProjects/CloudPlane", GITHUB_BRANCH_NAME, parts[0]); // CloudPlane
-         final Component history = getHistory();
-
-         return history != null ? TextComponent.ofChildren(updateMessage, Component.newline(), history) : updateMessage;
-@@ -45,7 +45,7 @@ public class PaperVersionFetcher implements VersionFetcher {
-                 String result = matcher.group();
-                 mcVer = result.substring(0, result.length() - 2); // strip 'R' anchor and trailing '-'
-             } else {
--                org.bukkit.Bukkit.getLogger().warning("Unable to match version to pattern! Report to PaperMC!");
-+                org.bukkit.Bukkit.getLogger().warning("Unable to match version to pattern! Report to CloudCraft!"); // CloudPlane
-                 org.bukkit.Bukkit.getLogger().warning("Pattern: " + VER_PATTERN.toString());
-                 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 d4807d574789c02c677911fcd05009988276c1cc..2eac9f11d59dccff6a361b609c21df447dd79550 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1928,7 +1928,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-
-     @DontObfuscate
-     public String getServerModName() {
--        return "Paper"; // Paper
-+        return "CloudPlane"; // Paper // CloudPlane
-     }
-
-     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 5f8e1584432ba16bf2954f6af16fef98cc3ff4ec..da63843f68d26d8480bf59bdbf1f4652719da268 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.Nullable; // Paper
- import javax.annotation.Nonnull; // Paper
+     public long getCacheTime() {
+@@ -49,7 +49,7 @@ public class PaperVersionFetcher implements VersionFetcher {
+         if (build.buildNumber().isEmpty() && build.gitCommit().isEmpty()) {
+             updateMessage = text("You are running a development version without access to version information", color(0xFF5300));
+         } else {
+-            updateMessage = getUpdateStatusMessage("PaperMC/Paper", build);
++            updateMessage = getUpdateStatusMessage("CloudCraftProjects/CloudPlane", build); // CloudPlane
+         }
+         final @Nullable Component history = this.getHistory();
 
- public final class CraftServer implements Server {
--    private final String serverName = "Paper"; // Paper
-+    private final String serverName = "CloudPlane"; // Paper // CloudPlane
-     private final String serverVersion;
-     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 c988afa496d25314451435eedd64079a0d87cef0..6d33e821b72e07445fc25253a09ac15492c60b75 100644
+index e02102280ed1dc300191d19bbca8f00e17701753..00309c8e383d77a1263cb247b1c896f99ff32722 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -302,7 +302,7 @@ public class Main {
+@@ -303,7 +303,7 @@ public class Main {
                      if (buildDate.before(deadline.getTime())) {
                          // Paper start - This is some stupid bullshit
                          System.err.println("*** Warning, you've not updated in a while! ***");
 -                        System.err.println("*** Please download a new build as per instructions from https://papermc.io/downloads/paper ***"); // Paper
-+                        System.err.println("*** Please download a new build as per instructions from https://nightly.link/CloudCraftProjects/CloudPlane/workflows/build/master/CloudPlane-Artifacts.zip ***"); // Paper // CloudPlane
++                        System.err.println("*** Please download a new build as per instructions from https://dl.cloudcraftmc.de/r/cloudplane ***"); // Paper // CloudPlane
                          //System.err.println("*** Server will start in 20 seconds ***");
                          //Thread.sleep(TimeUnit.SECONDS.toMillis(20));
                          // Paper end

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

@@ -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 da63843f68d26d8480bf59bdbf1f4652719da268..e2fe625f77bf688c49e17b90cb14311f3b828f55 100644
+index 978f29a76af86e3e1397551d79cdec4fecec071a..09144d69edf6e2f90378d37a3d3434f61af9c015 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1038,6 +1038,7 @@ public final class CraftServer implements Server {
+@@ -1033,6 +1033,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))
-@@ -3044,6 +3045,13 @@ public final class CraftServer implements Server {
+@@ -3039,6 +3040,13 @@ public final class CraftServer implements Server {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
 
@@ -268,10 +268,10 @@ index da63843f68d26d8480bf59bdbf1f4652719da268..e2fe625f77bf688c49e17b90cb14311f
          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 6d33e821b72e07445fc25253a09ac15492c60b75..2af824686c14ad78b0edb9e32ec224787694c3bb 100644
+index 00309c8e383d77a1263cb247b1c896f99ff32722..f5439b615b7a9d5317647b723120c86e3616007e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -175,6 +175,14 @@ public class Main {
+@@ -176,6 +176,14 @@ public class Main {
                          .describedAs("Jar file");
                  // Paper end
 

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

@@ -25,7 +25,7 @@ index 4672e336eada51d1dc6b6b7415392a8598634c16..7352b9094917b57cae64198570c8768d
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java
-index e4086bea596e5f5d71491e0b7ad650d76939b8f9..5676e34c9b1dacbbac6ea34eeeb78b95b61cb93c 100644
+index e4086bea596e5f5d71491e0b7ad650d76939b8f9..8af25d5e1e13d3bd0dbb2b0517565c0883c52de2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java
 @@ -76,7 +76,12 @@ public class ServerConfigurationPacketListenerImpl extends ServerCommonPacketLis
@@ -34,24 +34,11 @@ index e4086bea596e5f5d71491e0b7ad650d76939b8f9..5676e34c9b1dacbbac6ea34eeeb78b95
      public void startConfiguration() {
 -        this.send(new ClientboundCustomPayloadPacket(new BrandPayload(this.server.getServerModName())));
 +        // CloudPlane start
-+        String serverBrand = dev.booky.cloudplane.CloudPlaneConfig.detailedBrand
-+                ? String.valueOf(this.server.server.serverVersion) : this.server.getServerModName();
++        String serverBrand = !dev.booky.cloudplane.CloudPlaneConfig.detailedBrand ? this.server.getServerModName() :
++                this.server.getServerModName() + ' ' + io.papermc.paper.ServerBuildInfo.buildInfo().asString(io.papermc.paper.ServerBuildInfo.StringRepresentation.VERSION_SIMPLE);
 +        this.send(new ClientboundCustomPayloadPacket(new BrandPayload(serverBrand)));
 +        // CloudPlane end
 +
          LayeredRegistryAccess<RegistryLayer> layeredregistryaccess = this.server.registries();
          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 e2fe625f77bf688c49e17b90cb14311f3b828f55..e47d373b7295fd3162427224432efe8e7b421972 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -270,7 +270,7 @@ import javax.annotation.Nonnull; // Paper
-
- public final class CraftServer implements Server {
-     private final String serverName = "CloudPlane"; // Paper // CloudPlane
--    private final String serverVersion;
-+    public final String serverVersion; // CloudPlane - private-f -> public-f
-     private final String bukkitVersion = Versioning.getBukkitVersion();
-     private final Logger logger = Logger.getLogger("Minecraft");
-     private final ServicesManager servicesManager = new SimpleServicesManager();

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

@@ -46,10 +46,10 @@ index b69eeb58eb93869ed1637b7e98eededf14b13ced..cabef25272c170e02ccea0151648726f
          dev.booky.cloudplane.CloudPlaneConfig.init((java.io.File) this.options.valueOf("cloudplane-settings")); // CloudPlane - load configuration
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 2af824686c14ad78b0edb9e32ec224787694c3bb..65af64260681782572a08bb493b07fb3858a20bc 100644
+index f5439b615b7a9d5317647b723120c86e3616007e..d51d20cf97b00734f7b9cacc92623f175f1a9f6a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -181,6 +181,12 @@ public class Main {
+@@ -182,6 +182,12 @@ public class Main {
                          .ofType(File.class)
                          .defaultsTo(new File("cloudplane.yml"))
                          .describedAs("Yml file");