Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@a4feb28 Update to 1.21.8
PaperMC/Paper@6db4bc0 1.21.8 generators
PaperMC/Paper@d8cb3f5 Update DataConverter to 1.21.8-RC1
PaperMC/Paper@1f93f56 [ci-skip] Improve getPotentialBedLocation deprecation (#12857)
PaperMC/Paper@6fb36e3 Replace compileOnly with implementation for test visibility (#12841)
PaperMC/Paper@aa4ef06 Update DataConverter constants for 1.21.8
PaperMC/Paper@f7c59f9 Fix broken resource pack API when configured in configuration stage (#12866)
PaperMC/Paper@0dad7f1 Add Bee#set/getTimeSinceSting() methods (#12792)
PaperMC/Paper@782ce95 Allow forcing break effects when using breakNaturally (#12734)
PaperMC/Paper@a2d37f1 Remove invalid team colors nicely (#12874)

gradle.properties

@@ -1,8 +1,8 @@
 group=me.samsuik.sakura
-version=1.21.7-R0.1-SNAPSHOT
-mcVersion=1.21.7
+version=1.21.8-R0.1-SNAPSHOT
+mcVersion=1.21.8
 
-paperRef=e792779dd8d8ba06d6448ca34bdd98da1daed481
+paperRef=a2d37f12fb8b564fe0fe88cace5d80cfc13130d6
 
 org.gradle.jvmargs=-Xmx2G
 org.gradle.vfs.watch=false

sakura-server/build.gradle.kts.patch

@@ -7,7 +7,7 @@
 +val serverBrand = rootProject.name
  
  dependencies {
-     mache("io.papermc:mache:1.21.7+build.2")
+     mache("io.papermc:mache:1.21.8+build.1")
 @@ -26,6 +_,17 @@
      minecraftVersion = providers.gradleProperty("mcVersion")
      gitFilePatches = false
@@ -57,7 +57,7 @@
      implementation("ca.spottedleaf:concurrentutil:0.0.3")
      implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
      implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
-@@ -212,7 +_,7 @@
+@@ -208,7 +_,7 @@
              "Specification-Version" to project.version,
              "Specification-Vendor" to "Paper Team",
              "Brand-Id" to "papermc:paper",
@@ -66,7 +66,7 @@
              "Build-Number" to (build ?: ""),
              "Build-Time" to buildTime.toString(),
              "Git-Branch" to gitBranch,
-@@ -271,7 +_,7 @@
+@@ -267,7 +_,7 @@
      jvmArgumentProviders.add(provider)
  }
  

sakura-server/paper-patches/features/0001-Client-Visibility-Settings.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Client Visibility Settings
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ca1c6c4c36046fd71a0495c2cb23912d5a34909a..fceb393ba0bca6f6ce0daa3b379dfecafc5c5863 100644
+index 095d3bdc84998c00dae4bf8a283a2821a3552b17..252c15ab39fcbfeecc6d2aaafb2e504b11f3c6fc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2450,6 +2450,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
+@@ -2449,6 +2449,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
              handle.expToDrop = data.getIntOr("expToDrop", 0);
              handle.keepLevel = data.getBooleanOr("keepLevel", false);
          });
@@ -20,7 +20,7 @@ index ca1c6c4c36046fd71a0495c2cb23912d5a34909a..fceb393ba0bca6f6ce0daa3b379dfeca
      }
  
      public void setExtraData(ValueOutput output) {
-@@ -2471,6 +2476,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
+@@ -2470,6 +2475,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
          paper.putLong("LastLogin", handle.loginTime);
          paper.putLong("LastSeen", System.currentTimeMillis());
          // Paper end
@@ -31,7 +31,7 @@ index ca1c6c4c36046fd71a0495c2cb23912d5a34909a..fceb393ba0bca6f6ce0daa3b379dfeca
      }
  
      @Override
-@@ -3175,6 +3184,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
+@@ -3174,6 +3183,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
          return this.getHandle().allowsListing();
      }
  

sakura-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -348,6 +_,18 @@
+@@ -347,6 +_,18 @@
      }
      // Paper end