Initial update to 1.21.10

build.gradle.kts

@@ -2,7 +2,7 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
-    id("io.papermc.paperweight.patcher") version "2.0.0-beta.17"
+    id("io.papermc.paperweight.patcher") version "2.0.0-beta.19"
 }
 
 paperweight {

gradle.properties

@@ -1,12 +1,16 @@
-org.gradle.configuration-cache=true
-org.gradle.caching=true
-org.gradle.parallel=true
-org.gradle.vfs.watch=true
+group = gg.pufferfish.pufferfish
+version = 1.21.11-R0.1-SNAPSHOT
 
-org.gradle.jvmargs="-Xmx6G"
+# This is the current API version for use in (paper-)plugin.yml files
+# During snapshot cycles this should be the anticipated version of the release target
+apiVersion = 1.21.11
+mcVersion = 1.21.11
 
-group=gg.pufferfish.pufferfish
-version=1.21.8-R0.1-SNAPSHOT
-mcVersion=1.21.8
-paperRef=ed31825a8d9d4016a1fcd4c10b24926b51ced4cc
-paperweight.defaultMinFuzz=0.1
+paperRef = b36b49ac236c3ce5bf0a2c3991f3411733495bd5
+
+paperweight.defaultMinFuzz = 0.1
+org.gradle.configuration-cache = true
+org.gradle.caching = true
+org.gradle.parallel = true
+org.gradle.vfs.watch = false
+org.gradle.jvmargs = -Xmx4G

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-rc-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

pufferfork-api/build.gradle.kts.patch

@@ -1,14 +1,14 @@
 --- a/paper-api/build.gradle.kts
 +++ b/paper-api/build.gradle.kts
-@@ -51,6 +_,7 @@
+@@ -52,6 +_,7 @@
      api("org.apache.logging.log4j:log4j-api:$log4jVersion")
      api("org.slf4j:slf4j-api:$slf4jVersion")
      api("com.mojang:brigadier:1.3.10")
 +    api("io.sentry:sentry:8.14.0") // Pufferfish
 
      // Deprecate bungeecord-chat in favor of adventure
      api("net.md-5:bungeecord-chat:$bungeeCordChatVersion") {
-@@ -84,13 +_,13 @@
+@@ -85,13 +_,13 @@
      testImplementation("org.apache.commons:commons-lang3:3.17.0")
      testImplementation("org.junit.jupiter:junit-jupiter:5.12.2")
      testImplementation("org.hamcrest:hamcrest:2.2")
@@ -24,7 +24,7 @@
  idea {
      module {
          generatedSourceDirs.add(generatedDir.toFile())
-@@ -100,6 +_,18 @@
+@@ -101,6 +_,18 @@
      main {
          java {
              srcDir(generatedDir)
@@ -43,21 +43,7 @@
          }
      }
  }
-@@ -147,6 +_,13 @@
-     }
- }
-
-+// Pufferfish Start
-+tasks.withType<JavaCompile> {
-+    val compilerArgs = options.compilerArgs
-+    compilerArgs.add("--add-modules=jdk.incubator.vector")
-+}
-+// Pufferfish End
-+
- tasks.jar {
-     from(generateApiVersioningFile.map { it.outputs.files.singleFile }) {
-         into("META-INF/maven/${project.group}/${project.name}")
-@@ -166,8 +_,9 @@
+@@ -183,8 +_,9 @@
 
  tasks.withType<Javadoc>().configureEach {
      val options = options as StandardJavadocDocletOptions
@@ -68,7 +54,7 @@
      options.isDocFilesSubDirs = true
      options.links(
          "https://guava.dev/releases/33.3.1-jre/api/docs/",
-@@ -199,11 +_,11 @@
+@@ -216,11 +_,11 @@
      }
 
      // workaround for https://github.com/gradle/gradle/issues/4046
@@ -82,7 +68,21 @@
                  include("**/doc-files/**")
              }
              into("build/docs/javadoc")
-@@ -218,6 +_,7 @@
+@@ -228,6 +_,13 @@
+     }
+ }
+
++// Pufferfish Start
++tasks.withType<JavaCompile> {
++    val compilerArgs = options.compilerArgs
++    compilerArgs.add("--add-modules=jdk.incubator.vector")
++}
++// Pufferfish End
++
+ tasks.test {
+     useJUnitPlatform()
+
+@@ -235,6 +_,7 @@
      val provider = objects.newInstance<MockitoAgentProvider>()
      provider.fileCollection.from(mockitoAgent)
      jvmArgumentProviders.add(provider)

pufferfork-api/paper-patches/features/0001-Add-Sentry.patch

@@ -102,10 +102,10 @@ index 163e9a0e179dc88be93614ff66ee2be3eccc694f..78cdf669328fc1ec5e9943033a11d220
 
              if (cloader instanceof PluginClassLoader) {
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index 0bc98377ac5533c9d6fe1b99c99d86201971a100..b419678018a9bf8649d3071c38bfa3d0b46f2036 100644
+index 135c77b05dfded979d6e23956d31c34893f0b7f6..77421563451f5c2a6dc344d284d3d5c36acd92f1 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-@@ -206,6 +206,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
+@@ -209,6 +209,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
          throw new ClassNotFoundException(name);
      }
 

pufferfork-api/paper-patches/files/src/main/java/org/bukkit/map/MapPalette.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/map/MapPalette.java
 +++ b/src/main/java/org/bukkit/map/MapPalette.java
-@@ -395,9 +_,15 @@
+@@ -394,9 +_,15 @@
          temp.getRGB(0, 0, temp.getWidth(), temp.getHeight(), pixels, 0, temp.getWidth());
 
          byte[] result = new byte[temp.getWidth() * temp.getHeight()];
@@ -16,7 +16,7 @@
          return result;
      }
 
-@@ -500,4 +_,18 @@
+@@ -511,4 +_,18 @@
          @org.jetbrains.annotations.ApiStatus.Internal // Paper
          byte matchColor(@NotNull Color color);
      }

pufferfork-api/paper-patches/files/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java.patch

@@ -8,7 +8,7 @@
 
      static {
          ClassLoader.registerAsParallelCapable();
-@@ -212,7 +_,7 @@
+@@ -215,7 +_,7 @@
          }
          Class<?> result = classes.get(name);
 
@@ -17,15 +17,15 @@
              String path = name.replace('.', '/').concat(".class");
              // Add details to zip file errors - help debug classloading
              JarEntry entry;
-@@ -268,6 +_,7 @@
+@@ -271,6 +_,7 @@
              this.setClass(name, result); // Paper
          }
 
 +        if (result == null) throw new ClassNotFoundException(name); // Pufferfish
          return result;
      }
 
-@@ -282,7 +_,8 @@
+@@ -285,7 +_,8 @@
              // Paper end
              super.close();
          } finally {

pufferfork-server/build.gradle.kts.patch

@@ -1,6 +1,6 @@
 --- a/paper-server/build.gradle.kts
 +++ b/paper-server/build.gradle.kts
-@@ -26,6 +_,17 @@
+@@ -22,6 +_,17 @@
      minecraftVersion = providers.gradleProperty("mcVersion")
      gitFilePatches = false
 
@@ -17,8 +17,8 @@
 +
      spigot {
          enabled = true
-         buildDataRef = "436eac9815c211be1a2a6ca0702615f995e81c44"
-@@ -107,7 +_,21 @@
+         buildDataRef = "17f77cee7117ab9d6175f088ae8962bfd04e61a9"
+@@ -104,7 +_,21 @@
      }
  }
 
@@ -41,16 +41,16 @@
  configurations.named(log4jPlugins.compileClasspathConfigurationName) {
      extendsFrom(configurations.compileClasspath.get())
  }
-@@ -129,7 +_,7 @@
+@@ -127,7 +_,7 @@
  }
 
  dependencies {
 -    implementation(project(":paper-api"))
 +    implementation(project(":pufferfork-api")) // Pufferfork
-     implementation("ca.spottedleaf:concurrentutil:0.0.3")
+     implementation("ca.spottedleaf:concurrentutil:0.0.8")
      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
-@@ -165,6 +_,13 @@
+@@ -162,6 +_,13 @@
          isTransitive = false // includes junit
      }
 
@@ -59,13 +59,13 @@
 +        exclude(group="org.yaml", module="snakeyaml")
 +    }
 +    // Pufferfish end
-+    implementation("net.serlith:Flare:4.0.3") // Pufferfish - flare
++    implementation("net.serlith:Flare:4.0.9") // Pufferfish - flare
 +
      testImplementation("io.github.classgraph:classgraph:4.8.179") // For mob goal test
+     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
      testImplementation("org.junit.jupiter:junit-jupiter:5.12.2")
-     testImplementation("org.junit.platform:junit-platform-suite-engine:1.12.2")
-@@ -188,6 +_,13 @@
-     implementation("me.lucko:spark-paper:1.10.133-20250413.112336-1")
+@@ -186,6 +_,13 @@
+     implementation("me.lucko:spark-paper:1.10.152")
  }
 
 +// Pufferfish Start - SIMD Optimizations
@@ -78,7 +78,7 @@
  tasks.jar {
      manifest {
          val git = Git(rootProject.layout.projectDirectory.path)
-@@ -200,14 +_,14 @@
+@@ -198,14 +_,14 @@
          val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim()
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
@@ -98,7 +98,7 @@
              "Build-Number" to (build ?: ""),
              "Build-Time" to buildTime.toString(),
              "Git-Branch" to gitBranch,
-@@ -266,7 +_,7 @@
+@@ -264,7 +_,7 @@
      jvmArgumentProviders.add(provider)
  }