Update upstream

Author: Malfrador

build.gradle.kts

@@ -3,7 +3,7 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
     java // TODO java launcher tasks
-    id("io.papermc.paperweight.patcher") version "2.0.0-beta.17"
+    id("io.papermc.paperweight.patcher") version "2.0.0-beta.19"
 }
 
 paperweight {
@@ -55,7 +55,7 @@ subprojects {
         options.encoding = Charsets.UTF_8.name()
         options.release = 21
         options.isFork = true
-        options.compilerArgs.add("-Xlint:-removal")
+        options.compilerArgs.addAll(listOf("-Xlint:-deprecation", "-Xlint:-removal"))
     }
     tasks.withType<Javadoc> {
         options.encoding = Charsets.UTF_8.name()

gradle.properties

@@ -1,7 +1,7 @@
 group=de.erethon.papyrus
-version=1.21.8-R0.1-SNAPSHOT
-mcVersion=1.21.8
-paperRef=9aaaadffaa0caad086cf04709904b47eaac161d7
+version=1.21.9-R0.1-SNAPSHOT
+mcVersion=1.21.9
+paperRef=dad730f2948e4ed0cb42f2af79009ffea4541ba5
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 

gradlew

@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -40,7 +40,7 @@
      options.use()
      options.isDocFilesSubDirs = true
      options.links(
-@@ -199,11 +_,11 @@
+@@ -201,11 +_,11 @@
      }
 
      // workaround for https://github.com/gradle/gradle/issues/4046

papyrus-api/build.gradle.kts.patch

@@ -9,7 +9,7 @@
  import net.kyori.adventure.text.Component;
  import net.kyori.adventure.text.minimessage.MiniMessage;
  import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
-@@ -2723,4 +_,6 @@
+@@ -2760,4 +_,6 @@
       */
      void allowPausing(@NotNull org.bukkit.plugin.Plugin plugin, boolean value);
      // Paper end - API to check if the server is sleeping

papyrus-api/paper-patches/files/src/main/java/org/bukkit/Server.java.patch

@@ -1,24 +1,15 @@
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -6,6 +_,8 @@
- import java.util.UUID;
- import io.papermc.paper.world.damagesource.CombatTracker;
- import io.papermc.paper.world.damagesource.FallLocationType;
-+
-+import de.erethon.spellbook.api.SpellCaster;
- import org.bukkit.FluidCollisionMode;
- import org.bukkit.Location;
- import org.bukkit.Material;
-@@ -30,7 +_,7 @@
+@@ -29,7 +_,7 @@
  /**
   * Represents a living entity, such as a monster or player
   */
 -public interface LivingEntity extends Attributable, Damageable, ProjectileSource, io.papermc.paper.entity.Frictional { // Paper
-+public interface LivingEntity extends Attributable, Damageable, ProjectileSource, io.papermc.paper.entity.Frictional, SpellCaster { // Papyrus
++public interface LivingEntity extends Attributable, Damageable, ProjectileSource, io.papermc.paper.entity.Frictional, de.erethon.spellbook.api.SpellCaster { // Papyrus
 
      /**
       * Gets the height of the living entity's eyes above its Location.
-@@ -1455,6 +_,12 @@
+@@ -1466,6 +_,12 @@
       */
      boolean canUseEquipmentSlot(org.bukkit.inventory.@NotNull EquipmentSlot slot);
      // Paper end - Expose canUseSlot

papyrus-api/paper-patches/files/src/main/java/org/bukkit/entity/LivingEntity.java.patch

@@ -39,13 +39,13 @@
  configurations.named(log4jPlugins.compileClasspathConfigurationName) {
      extendsFrom(configurations.compileClasspath.get())
  }
-@@ -129,7 +_,7 @@
+@@ -130,7 +_,7 @@
  }
 
  dependencies {
 -    implementation(project(":paper-api"))
 +    implementation(project(":papyrus-api"))
-     implementation("ca.spottedleaf:concurrentutil:0.0.3")
+     implementation("ca.spottedleaf:concurrentutil:0.0.5")
      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
 @@ -186,6 +_,9 @@
@@ -92,3 +92,18 @@
  sourceSets {
      main {
          java {
+@@ -358,7 +_,7 @@
+     mainClass.set(null as String?)
+ }
+ 
+-fill {
++/**fill { // Papyrus - We don't use fill
+     project("paper")
+     versionFamily(paperweight.minecraftVersion.map { it.split(".", "-").takeWhile { part -> part.toIntOrNull() != null }.take(2).joinToString(".") })
+     version(paperweight.minecraftVersion)
+@@ -373,4 +_,4 @@
+             }
+         }
+     }
+-}
++}**/