1.21.11

Author: Malfrador

gradle.properties

@@ -1,7 +1,8 @@
 group=de.erethon.papyrus
-version=1.21.10-R0.1-SNAPSHOT
-mcVersion=1.21.10
-paperRef=1f31ee5ebe45d97a596a4429d9871e3f8910cd28
+version=1.21.11-R0.1-SNAPSHOT
+mcVersion=1.21.11
+apiVersion=1.21.11
+paperRef=4446f17f652d3ce56860f8c06d6746fa3c1853fc
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists

papyrus-api/build.gradle.kts.patch

@@ -1,21 +1,21 @@
 --- a/paper-api/build.gradle.kts
 +++ b/paper-api/build.gradle.kts
-@@ -89,16 +_,23 @@
+@@ -91,7 +_,7 @@
      testRuntimeOnly("org.junit.platform:junit-platform-launcher")
  }
 
 -val generatedDir: java.nio.file.Path = layout.projectDirectory.dir("src/generated/java").asFile.toPath()
--idea {
--    module {
--        generatedSourceDirs.add(generatedDir.toFile())
--    }
--}
-+val generatedApiPath: java.nio.file.Path = rootProject.layout.projectDirectory.dir("paper-api/src/generated/java").asFile.toPath()
- sourceSets {
++val generatedDir: java.nio.file.Path = rootProject.layout.projectDirectory.dir("paper-api/src/generated/java").asFile.toPath()
+ idea {
+     module {
+         generatedSourceDirs.add(generatedDir.toFile())
+@@ -101,9 +_,21 @@
      main {
          java {
--            srcDir(generatedDir)
-+            srcDir(generatedApiPath)
+             srcDir(generatedDir)
+-        }
+-    }
+-}
 +            srcDir(file("../paper-api/src/main/java"))
 +        }
 +        resources {
@@ -28,10 +28,13 @@
 +        }
 +        resources {
 +            srcDir(file("../paper-api/src/test/resources"))
-         }
-     }
- }
-@@ -165,7 +_,7 @@
++        }
++    }
++    }
+ 
+ val outgoingVariants = arrayOf("runtimeElements", "apiElements", "sourcesElements", "javadocElements")
+ val mainCapability = "${project.group}:${project.name}:${project.version}"
+@@ -183,7 +_,7 @@
 
  tasks.withType<Javadoc>().configureEach {
      val options = options as StandardJavadocDocletOptions
@@ -40,7 +43,7 @@
      options.use()
      options.isDocFilesSubDirs = true
      options.links(
-@@ -198,11 +_,11 @@
+@@ -216,11 +_,11 @@
      }
 
      // workaround for https://github.com/gradle/gradle/issues/4046

papyrus-server/build.gradle.kts.patch

@@ -1,9 +1,9 @@
 --- a/paper-server/build.gradle.kts
 +++ b/paper-server/build.gradle.kts
-@@ -22,9 +_,18 @@
- paperweight {
+@@ -22,6 +_,16 @@
      minecraftVersion = providers.gradleProperty("mcVersion")
      gitFilePatches = false
+ 
 +    val papyrus = forks.register("papyrus") {
 +        upstream.patchDir("paperServer") {
 +            upstreamPath = "paper-server"
@@ -13,23 +13,61 @@
 +        }
 +    }
 +    activeFork = papyrus
- 
++
      spigot {
--        enabled = true
-+        enabled = false
+         enabled = false
          buildDataRef = "42d18d4c4653ffc549778dbe223f6994a031d69e"
-         packageVersion = "v1_21_R6" // also needs to be updated in MappingEnvironment
+@@ -45,6 +_,29 @@
+     }
+ }
+ 
++val generatedDir: java.nio.file.Path = layout.projectDirectory.dir("../paper-server/src/generated/java").asFile.toPath()
++sourceSets {
++    main {
++        java {
++            srcDir(generatedDir)
++            srcDir("../paper-server/src/main/java")
++        }
++        resources { srcDir("../paper-server/src/main/resources") }
++    }
++    test {
++        java { srcDir("../paper-server/src/test/java") }
++        resources { srcDir("../paper-server/src/test/resources") }
++    }
++}
++
++val log4jPlugins = sourceSets.create("log4jPlugins") {
++    java { srcDir("../paper-server/src/log4jPlugins/java") }
++}
++
++configurations.named(log4jPlugins.compileClasspathConfigurationName) {
++    extendsFrom(configurations.compileClasspath.get())
++}
++
+ tasks.generateDevelopmentBundle {
+     libraryRepositories.addAll(
+         "https://repo.maven.apache.org/maven2/",
+@@ -104,10 +_,6 @@
      }
+ }
+ 
+-val log4jPlugins = sourceSets.create("log4jPlugins")
+-configurations.named(log4jPlugins.compileClasspathConfigurationName) {
+-    extendsFrom(configurations.compileClasspath.get())
+-}
+ val alsoShade: Configuration by configurations.creating
+ 
+ val runtimeConfiguration by configurations.consumable("runtimeConfiguration") {
 @@ -127,7 +_,7 @@
  }
 
  dependencies {
 -    implementation(project(":paper-api"))
 +    implementation(project(":papyrus-api"))
-     implementation("ca.spottedleaf:concurrentutil:0.0.5")
+     implementation("ca.spottedleaf:concurrentutil:0.0.7")
      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
-@@ -183,6 +_,8 @@
+@@ -184,6 +_,8 @@
      // Spark
      implementation("me.lucko:spark-api:0.1-20240720.200737-2")
      implementation("me.lucko:spark-paper:1.10.152")
@@ -38,7 +76,7 @@
  }
 
  tasks.jar {
-@@ -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",
@@ -58,26 +96,21 @@
              "Build-Number" to (build ?: ""),
              "Build-Time" to buildTime.toString(),
              "Git-Branch" to gitBranch,
-@@ -263,7 +_,7 @@
+@@ -264,17 +_,9 @@
      jvmArgumentProviders.add(provider)
  }
 
 -val generatedDir: java.nio.file.Path = layout.projectDirectory.dir("src/generated/java").asFile.toPath()
-+val generatedDir: java.nio.file.Path = layout.projectDirectory.dir("../paper-server/src/generated/java").asFile.toPath()
  idea {
      module {
          generatedSourceDirs.add(generatedDir.toFile())
-@@ -273,7 +_,13 @@
-     main {
-         java {
-             srcDir(generatedDir)
-+            srcDir("../paper-server/src/main/java")
-         }
-+        resources { srcDir("../paper-server/src/main/resources") }
-+    }
-+    test {
-+        java { srcDir("../paper-server/src/test/java") }
-+        resources { srcDir("../paper-server/src/test/resources") }
+-    }
+-}
+-sourceSets {
+-    main {
+-        java {
+-            srcDir(generatedDir)
+-        }
      }
  }
 

papyrus-server/minecraft-patches/sources/net/minecraft/BlockUtil.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/core/component/PatchedDataComponentMap.java
 +++ b/net/minecraft/core/component/PatchedDataComponentMap.java
-@@ -217,6 +_,19 @@
+@@ -213,6 +_,19 @@
          }
      }
 

papyrus-server/minecraft-patches/sources/net/minecraft/core/component/PatchedDataComponentMap.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/network/syncher/EntityDataSerializers.java
 +++ b/net/minecraft/network/syncher/EntityDataSerializers.java
-@@ -65,7 +_,7 @@
+@@ -67,7 +_,7 @@
              // If the codec is called during an obfuscation session, downgrade the context's obf level to OVERSIZED if it isn't already.
              // Entity data cannot be fully obfuscated as entities might render out specific values (e.g. count or custom name).
              try (final io.papermc.paper.util.SafeAutoClosable ignored = io.papermc.paper.util.sanitizer.ItemObfuscationSession.withContext(c -> c.level(io.papermc.paper.util.sanitizer.ItemObfuscationSession.ObfuscationLevel.OVERSIZED))) {

papyrus-server/minecraft-patches/sources/net/minecraft/network/syncher/EntityDataSerializers.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1651,6 +_,11 @@
+@@ -1646,6 +_,11 @@
          // Paper start - Server Tick Events
          long endTime = System.nanoTime();
          long remaining = this.nextTickTimeNanos - endTime;

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

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -323,6 +_,9 @@
+@@ -320,6 +_,9 @@
          this.server.loadPlugins();
          this.server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.STARTUP);
          // CraftBukkit end

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

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/level/ChunkMap.java
 +++ b/net/minecraft/server/level/ChunkMap.java
-@@ -247,7 +_,16 @@
+@@ -253,7 +_,16 @@
              return;
          }