Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@02e4e76 Updated Upstream (Paper)
PurpurMC/Purpur@afabbc9 missed these
PurpurMC/Purpur@699448c Merge branch 'ver/1.21' into ver/1.21.1
PurpurMC/Purpur@edd9be7 Merge branch 'ver/1.21' into ver/1.21.1
PurpurMC/Purpur@abf2f21 Updated Upstream (Paper)
PurpurMC/Purpur@366af80 Updated Upstream (Paper)
PurpurMC/Purpur@07979c3 Updated Upstream (Paper)
PurpurMC/Purpur@3f790ac Updated Upstream (Paper)
PurpurMC/Purpur@201e928 Updated Upstream (Pufferfish) (#1575)
PurpurMC/Purpur@f2307b8 Updated Upstream (Paper)
PurpurMC/Purpur@bba87bf Updated Upstream (Paper)

gradle.properties

@@ -1,8 +1,8 @@
 group = org.purpurmc.tentacles
-version = 1.21-R0.1-SNAPSHOT
+version = 1.21.1-R0.1-SNAPSHOT
 
-mcVersion=1.21
-purpurCommit = 4e55e26f4dcd046f68c977b6348ad3ae265aa896
+mcVersion=1.21.1
+purpurCommit = bba87bf2acf8221e89f6b557fbeed5bf0f47fbf0
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/api/0001-Rebrand.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
-index 7107eabf02d9d9b69d97c978ba421ad52031ec3f..376da865092e49fc3f742883c912f80e4742576d 100644
+index 8c2c5ea14a839c8767bbf120ae5512f65475cbb0..8b7179c95b92b36237f14a14c1d8477b678f1b6e 100644
 --- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
 +++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
-@@ -25,6 +25,13 @@ public interface ServerBuildInfo {
+@@ -32,6 +32,13 @@ public interface ServerBuildInfo {
      Key BRAND_PURPUR_ID = Key.key("purpurmc", "purpur");
      // Purpur end
 

patches/server/0001-Rebrand.patch

@@ -5,35 +5,35 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 409a46eb82262b00a626683072f2734255f2c2b8..7a4fb0fcd8935f8d98f530cce38403cff22e9487 100644
+index 97a4a54dfa74df7aafd9df5a0f2fdac72471c2d5..bd707550cbd86e2521bad76b38e489507c2dafcd 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -13,7 +13,7 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
  val alsoShade: Configuration by configurations.creating
 
  dependencies {
--    implementation(project(":purpur-api")) // Purpur
-+    implementation(project(":tentacles-api")) // Purpur // Tentacles
+-    implementation(project(":purpur-api")) // Pufferfish // Paper // Purpur
++    implementation(project(":tentacles-api")) // Pufferfish // Paper // Purpur // Tentacles
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.21.0")
      implementation("net.minecrell:terminalconsoleappender:1.3.0")
-@@ -88,14 +88,14 @@ tasks.jar {
+@@ -103,14 +103,14 @@ tasks.jar {
          val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
--            "Implementation-Title" to "Purpur", // Purpur
-+            "Implementation-Title" to "Tentacles", // Purpur // Tentacles
+-            "Implementation-Title" to "Purpur", // Pufferfish // Purpur
++            "Implementation-Title" to "Tentacles", // Pufferfish // Purpur // Tentacles
              "Implementation-Version" to implementationVersion,
              "Implementation-Vendor" to date, // Paper
--            "Specification-Title" to "Purpur", // Purpur
-+            "Specification-Title" to "Tentacles", // Purpur // Tentacles
+-            "Specification-Title" to "Purpur", // Pufferfish // Purpur
++            "Specification-Title" to "Tentacles", // Pufferfish // Purpur // Tentacles
              "Specification-Version" to project.version,
--            "Specification-Vendor" to "Purpur Team", // Purpur
--            "Brand-Id" to "purpurmc:purpur", // Purpur
--            "Brand-Name" to "Purpur", // Purpur
-+            "Specification-Vendor" to "Tentacles Team", // Purpur // Tentacles
-+            "Brand-Id" to "tentaclesmc:tentacles", // Purpur // Tentacles
-+            "Brand-Name" to "Tentacles", // Purpur // Tentacles
+-            "Specification-Vendor" to "Purpur Team", // Pufferfish // Purpur
+-            "Brand-Id" to "purpurmc:purpur", // Pufferfish // Purpur
+-            "Brand-Name" to "Purpur", // Pufferfish // Purpur
++            "Specification-Vendor" to "Tentacles Team", // Pufferfish // Purpur // Tentacles
++            "Brand-Id" to "tentaclesmc:tentacles", // Pufferfish // Purpur // Tentacles
++            "Brand-Name" to "Tentacles", // Pufferfish // Purpur // Tentacles
              "Build-Number" to (build ?: ""),
              "Build-Time" to Instant.now().toString(),
              "Git-Branch" to gitBranch, // Paper
@@ -111,18 +111,18 @@ index 3cb56595822799926a8141e60a42f5d1edfc6de5..4a82269a24baf65c62550166201a48dd
                  .completer(new ConsoleCommandCompleter(this.server))
                  .option(LineReader.Option.COMPLETE_IN_WORD, true);
 diff --git a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
-index a6e5950b5875cafd734300cdfbf58f5d3736f3c8..29b8f525dc6ef0fb93e830312ed3fea8c30222bc 100644
+index 3099c21ee589acf6edff5903a23673adf489024f..ea3a8e50641812e29300d783bdb82e895eb48c3d 100644
 --- a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
 +++ b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
-@@ -32,6 +32,7 @@ public record ServerBuildInfoImpl(
-
+@@ -33,6 +33,7 @@ public record ServerBuildInfoImpl(
      private static final String BRAND_PAPER_NAME = "Paper";
+     private static final String BRAND_PUFFERFISH_NAME = "Pufferfish"; // Purpur
      private static final String BRAND_PURPUR_NAME = "Purpur"; // Purpur
 +    private static final String BRAND_TENTACLES_NAME = "Tentacles"; // Tentacles
 
      private static final String BUILD_DEV = "DEV";
 
-@@ -43,9 +44,9 @@ public record ServerBuildInfoImpl(
+@@ -44,9 +45,9 @@ public record ServerBuildInfoImpl(
          this(
              getManifestAttribute(manifest, ATTRIBUTE_BRAND_ID)
                  .map(Key::key)
@@ -134,12 +134,12 @@ index a6e5950b5875cafd734300cdfbf58f5d3736f3c8..29b8f525dc6ef0fb93e830312ed3fea8
              SharedConstants.getCurrentVersion().getId(),
              SharedConstants.getCurrentVersion().getName(),
              getManifestAttribute(manifest, ATTRIBUTE_BUILD_NUMBER)
-@@ -62,7 +63,7 @@ public record ServerBuildInfoImpl(
+@@ -63,7 +64,7 @@ public record ServerBuildInfoImpl(
 
      @Override
      public boolean isBrandCompatible(final @NotNull Key brandId) {
--        return brandId.equals(this.brandId) || brandId.equals(BRAND_PAPER_ID); // Purpur
-+        return brandId.equals(this.brandId) || brandId.equals(BRAND_PAPER_ID) || brandId.equals(BRAND_PURPUR_ID); // Purpur // Tentacles
+-        return brandId.equals(this.brandId) || brandId.equals(BRAND_PAPER_ID) || brandId.equals(BRAND_PUFFERFISH_ID); // Purpur
++        return brandId.equals(this.brandId) || brandId.equals(BRAND_PAPER_ID) || brandId.equals(BRAND_PUFFERFISH_ID) || brandId.equals(BRAND_PURPUR_ID); // Purpur // Tentacles
      }
 
      @Override

scripts/updateUpstream.sh

@@ -7,7 +7,7 @@ set -e
 PS1="$"
 
 current=$(cat gradle.properties | grep purpurCommit | sed 's/purpurCommit = //')
-upstream=$(git ls-remote https://github.com/PurpurMC/Purpur | grep ver/1.21 | cut -f 1)
+upstream=$(git ls-remote https://github.com/PurpurMC/Purpur | grep ver/1.21.1 | cut -f 1)
 
 if [ "$current" != "$upstream" ]; then
     sed -i 's/purpurCommit = .*/purpurCommit = '"$upstream"'/' gradle.properties

scripts/upstreamCommit.sh

@@ -9,7 +9,7 @@
 set -e
 PS1="$"
 
-purpur=$(curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/PurpurMC/Purpur/compare/$1...ver/1.21 | jq -r '.commits[] | "PurpurMC/Purpur@\(.sha[:7]) \(.commit.message | split("\r\n")[0] | split("\n")[0])"')
+purpur=$(curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/PurpurMC/Purpur/compare/$1...ver/1.21.1 | jq -r '.commits[] | "PurpurMC/Purpur@\(.sha[:7]) \(.commit.message | split("\r\n")[0] | split("\n")[0])"')
 
 updated=""
 logsuffix=""