initial update to 1.21.11

DAB and AMB is not updated yet

Author: Toffikk

gradle.properties

@@ -1,12 +1,12 @@
 group = gg.pufferfish.pufferfish
-version = 1.21.10-R0.1-SNAPSHOT
+version = 1.21.11-R0.1-SNAPSHOT
 
 # 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.10
-mcVersion = 1.21.10
+apiVersion = 1.21.11
+mcVersion = 1.21.11
 
-paperRef = 2f7f1397628914e44154c326b56e5e7e9adf6721
+paperRef = b36b49ac236c3ce5bf0a2c3991f3411733495bd5
 
 paperweight.defaultMinFuzz = 0.1
 org.gradle.configuration-cache = true

pufferfork-api/build.gradle.kts.patch

@@ -1,14 +1,14 @@
 --- a/paper-api/build.gradle.kts
 +++ b/paper-api/build.gradle.kts
-@@ -50,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") {
-@@ -83,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())
-@@ -99,6 +_,18 @@
+@@ -101,6 +_,18 @@
      main {
          java {
              srcDir(generatedDir)
@@ -43,21 +43,7 @@
          }
      }
  }
-@@ -146,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}")
-@@ -165,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/",
-@@ -198,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")
-@@ -217,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-server/build.gradle.kts.patch

@@ -1,6 +1,6 @@
 --- a/paper-server/build.gradle.kts
 +++ b/paper-server/build.gradle.kts
-@@ -23,6 +_,17 @@
+@@ -22,6 +_,17 @@
      minecraftVersion = providers.gradleProperty("mcVersion")
      gitFilePatches = false
 
@@ -17,7 +17,7 @@
 +
      spigot {
          enabled = true
-         buildDataRef = "42d18d4c4653ffc549778dbe223f6994a031d69e"
+         buildDataRef = "17f77cee7117ab9d6175f088ae8962bfd04e61a9"
 @@ -104,7 +_,21 @@
      }
  }
@@ -47,7 +47,7 @@
  dependencies {
 -    implementation(project(":paper-api"))
 +    implementation(project(":pufferfork-api")) // Pufferfork
-     implementation("ca.spottedleaf:concurrentutil:0.0.7")
+     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
 @@ -162,6 +_,13 @@
@@ -62,9 +62,9 @@
 +    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")
-@@ -185,6 +_,13 @@
+@@ -186,6 +_,13 @@
      implementation("me.lucko:spark-paper:1.10.152")
  }
 
@@ -78,7 +78,7 @@
  tasks.jar {
      manifest {
          val git = Git(rootProject.layout.projectDirectory.path)
-@@ -197,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,
-@@ -263,7 +_,7 @@
+@@ -264,7 +_,7 @@
      jvmArgumentProviders.add(provider)
  }
 

pufferfork-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1301,7 +_,7 @@
+@@ -1304,7 +_,7 @@
                      final long ticksBehind = Math.max(1L, this.tickSchedule.getPeriodsAhead(l, tickStart));
                      final long catchup = (long)Math.max(
                          1,
@@ -9,7 +9,7 @@
                      );
 
                      // adjust ticksBehind so that it is not greater-than catchup
-@@ -2722,6 +_,7 @@
+@@ -2707,6 +_,7 @@
      // CraftBukkit end
 
      private ProfilerFiller createProfiler() {

pufferfork-server/minecraft-patches/sources/net/minecraft/server/ReloadableServerResources.java.patch

@@ -1,11 +1,11 @@
 --- a/net/minecraft/server/ReloadableServerResources.java
 +++ b/net/minecraft/server/ReloadableServerResources.java
-@@ -41,6 +_,8 @@
+@@ -42,6 +_,8 @@
          this.commands = new Commands(commandSelection, CommandBuildContext.simple(registries, enabledFeatures), true); // Paper - Brigadier Command API - use modern alias registration
          io.papermc.paper.command.brigadier.PaperCommands.INSTANCE.setDispatcher(this.commands, CommandBuildContext.simple(registries, enabledFeatures)); // Paper - Brigadier Command API
          io.papermc.paper.command.PaperCommands.registerCommands(); // Paper
 +        gg.pufferfish.pufferfish.command.registrar.PufferfishCommandRegistrar.registerCommands(); // Pufferfork - built-in pufferfish commands
 +        gg.pufferfish.pufferfish.flare.FlareCommand.init(); // Pufferfork - flare command
          this.advancements = new ServerAdvancementManager(registries);
-         this.functionLibrary = new ServerFunctionLibrary(functionCompilationLevel, this.commands.getDispatcher());
+         this.functionLibrary = new ServerFunctionLibrary(permissions, this.commands.getDispatcher());
      }

pufferfork-server/minecraft-patches/sources/net/minecraft/server/dedicated/DedicatedServer.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -277,6 +_,7 @@
+@@ -274,6 +_,7 @@
          this.server.spark.registerCommandBeforePlugins(this.server); // Paper - spark
          com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now

pufferfork-server/minecraft-patches/sources/net/minecraft/server/level/ServerEntity.java.patch

@@ -18,5 +18,5 @@
                  }
 +            } // Pufferfish - Better checking for useless move packets 
 
-                 if (this.entity.hasImpulse || this.trackDelta || this.entity instanceof LivingEntity && ((LivingEntity)this.entity).isFallFlying()) {
+                 if (this.entity.needsSync || this.trackDelta || this.entity instanceof LivingEntity && ((LivingEntity)this.entity).isFallFlying()) {
                      Vec3 deltaMovement = this.entity.getDeltaMovement();

pufferfork-server/minecraft-patches/sources/net/minecraft/server/level/ServerLevel.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
-@@ -836,7 +_,19 @@
+@@ -851,7 +_,19 @@
                                      }
 
                                      profilerFiller.push("tick");
@@ -21,7 +21,7 @@
                                      profilerFiller.pop();
                                  }
                              }
-@@ -982,7 +_,7 @@
+@@ -1002,7 +_,7 @@
          int minBlockZ = pos.getMinBlockZ();
          ProfilerFiller profilerFiller = Profiler.get();
          profilerFiller.push("thunder");

pufferfork-server/minecraft-patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2168,6 +_,7 @@
+@@ -2201,6 +_,7 @@
 
      @Override
      public void handlePaddleBoat(ServerboundPaddleBoatPacket packet) {

pufferfork-server/minecraft-patches/sources/net/minecraft/world/entity/ai/attributes/AttributeMap.java.patch

@@ -12,10 +12,10 @@
      }
 
      private void onAttributeModified(AttributeInstance instance) {
-@@ -44,7 +_,7 @@
+@@ -43,7 +_,7 @@
+     }
 
-     @Nullable
-     public AttributeInstance getInstance(Holder<Attribute> attribute) {
+     public @Nullable AttributeInstance getInstance(Holder<Attribute> attribute) {
 -        return this.attributes.computeIfAbsent(attribute, holder -> this.supplier.createInstance(this::onAttributeModified, (Holder<Attribute>)holder));
 +        return this.attributes.computeIfAbsent(attribute, this.createInstance); // Pufferfish - Reduce entity allocations (cache lambda, as for some reason java allocates it anyways)
      }