It runs now

gradle.properties

@@ -1,11 +1,11 @@
 group=de.erethon.papyrus
 
-version=1.20.4-R0.1-SNAPSHOT
-mcVersion=1.20.4
+version = 1.21-R0.1-SNAPSHOT
+mcVersion = 1.21
 
-pufferfishRef=fb16f9c80feb9ddacd94b4b6b99d6ad903bcdf9a
+paperCommit = dd49fba8c534d48c3693a751075ecb5836a9d458
 
 org.gradle.jvmargs=-Xmx8G
 org.gradle.caching=true
 org.gradle.parallel=true
-org.gradle.vfs.watch=false
+org.gradle.vfs.watch=false

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,26 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

patches/api/0001-combat-changes.patch

@@ -4,6 +4,19 @@ Date: Sun, 12 Jun 2022 21:43:09 +0200
 Subject: [PATCH] combat changes
 
 
+diff --git a/build.gradle.kts b/build.gradle.kts
+index fd39ed209b20c927054b8482c400beeeeab460a3..6298692b62df945d74b848c77eec40ea69cdea72 100644
+--- a/build.gradle.kts
++++ b/build.gradle.kts
+@@ -94,7 +94,7 @@ sourceSets {
+ }
+ // Paper end
+ // Paper start - brigadier API
+-val outgoingVariants = arrayOf("runtimeElements", "apiElements", "sourcesElements", "javadocElements")
++val outgoingVariants = arrayOf("runtimeElements", "apiElements", "sourcesElements") // Papyrus
+ configurations {
+     val outgoing = outgoingVariants.map { named(it) }
+     for (config in outgoing) {
 diff --git a/src/main/java/org/bukkit/attribute/Attribute.java b/src/main/java/org/bukkit/attribute/Attribute.java
 index 947874c0172b690e7752e49b7bec64e0c0308515..50199c1879152a5c4e272a09201f4d2a91e8d3c0 100644
 --- a/src/main/java/org/bukkit/attribute/Attribute.java

patches/server/0001-Branding-changes.patch

@@ -5,88 +5,87 @@ Subject: [PATCH] Branding changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 0dab873b52e718ffb83c655b6467abe53c8fdb1d..b3855e333315d782d2c4dc90429db714226cca3a 100644
+index 1a734293c9416f13324bb0edf8f950c9029f8bc4..a26ff240bb68379f00f3e1ec5e058c3b7be929d2 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -13,7 +13,7 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
  val alsoShade: Configuration by configurations.creating
 
  dependencies {
--    implementation(project(":pufferfish-api")) // Pufferfish // Paper
-+    implementation(project(":papyrus-api")) //Papyrus // Pufferfish // Paper
-     // Pufferfish start
-     implementation("io.papermc.paper:paper-mojangapi:1.19.2-R0.1-SNAPSHOT") {
-         exclude("io.papermc.paper", "paper-api")
-@@ -90,7 +90,7 @@ tasks.jar {
+-    implementation(project(":paper-api"))
++    implementation(project(":papyrus-api")) // Papyrus
+     // Paper start
+     implementation("org.jline:jline-terminal-jansi:3.21.0")
+     implementation("net.minecrell:terminalconsoleappender:1.3.0")
+@@ -72,24 +72,18 @@ tasks.jar {
+
+     manifest {
+         val git = Git(rootProject.layout.projectDirectory.path)
+-        val mcVersion = rootProject.providers.gradleProperty("mcVersion").get()
+-        val build = System.getenv("BUILD_NUMBER") ?: null
+         val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()
+-        val implementationVersion = "$mcVersion-${build ?: "DEV"}-$gitHash"
++        val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\""
+         val date = git("show", "-s", "--format=%ci", gitHash).getText().trim() // Paper
+         val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
-             "Implementation-Title" to "CraftBukkit",
--            "Implementation-Version" to "git-Pufferfish-$implementationVersion", // Pufferfish
-+            "Implementation-Version" to "git-Papyrus-$implementationVersion", // Papyrus // Pufferfish
+-            "Implementation-Title" to "Paper",
+-            "Implementation-Version" to implementationVersion,
++            "Implementation-Title" to "CraftBukkit",
++            "Implementation-Version" to "git-Paper-$implementationVersion",
              "Implementation-Vendor" to date, // Paper
-             "Specification-Title" to "Bukkit",
+-            "Specification-Title" to "Paper",
++            "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
-diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundServerDataPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundServerDataPacket.java
-index 6799a729f08991b2faabfdaf2a5d919e71621e98..e9c3d0ad0147353bbe22d7beabe72749c3fbbc95 100644
---- a/src/main/java/net/minecraft/network/protocol/game/ClientboundServerDataPacket.java
-+++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundServerDataPacket.java
-@@ -1,10 +1,11 @@
- package net.minecraft.network.protocol.game;
-
--import java.util.Optional;
- import net.minecraft.network.FriendlyByteBuf;
- import net.minecraft.network.chat.Component;
- import net.minecraft.network.protocol.Packet;
-
-+import java.util.Optional;
-+
- public class ClientboundServerDataPacket implements Packet<ClientGamePacketListener> {
-     private final Component motd;
-     private final Optional<byte[]> iconBytes;
-@@ -26,7 +27,7 @@ public class ClientboundServerDataPacket implements Packet<ClientGamePacketListe
-     public void write(FriendlyByteBuf buf) {
-         buf.writeComponent(this.motd);
-         buf.writeOptional(this.iconBytes, FriendlyByteBuf::writeByteArray);
--        buf.writeBoolean(this.enforcesSecureChat);
-+        buf.writeBoolean(true); // Papyrus
-     }
-
-     @Override
+-            "Specification-Vendor" to "Paper Team",
+-            "Brand-Id" to "papermc:paper",
+-            "Brand-Name" to "Paper",
+-            "Build-Number" to (build ?: ""),
+-            "Build-Time" to Instant.now().toString(),
++            "Specification-Vendor" to "Erethon",
+             "Git-Branch" to gitBranch, // Paper
+             "Git-Commit" to gitHash, // Paper
+             "CraftBukkit-Package-Version" to paperweight.craftBukkitPackageVersion.get(), // Paper
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d1c21d36de331905aedb08b0a8d4fbf97e100a13..8a75dc42e34f2c2ca9f205a77482d49c8e05032f 100644
+index 68f60e77e0bfd42b6419491c1d59b6432974216b..467ff9fd732f077ecf85f858f3c81b4a48b3a5a3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1862,7 +1862,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1869,7 +1869,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
      @DontObfuscate
      public String getServerModName() {
--        return "Pufferfish"; // Pufferfish > // Paper
-+        return "Papyrus"; // Papyrus - Papyrus > // Pufferfish - Pufferfish > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
+-        return io.papermc.paper.ServerBuildInfo.buildInfo().brandName(); // Paper
++        //return io.papermc.paper.ServerBuildInfo.buildInfo().brandName(); // Paper
++        return "Papyrus"; // Papyrus - Papyrus > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
      }
 
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9f5a6398a7dca841570a895054cee969dc96bca4..d122cb85aa720244a2bc1f62f5e2bb1c086ea237 100644
+index caf6ff33b42472d30f28629470e12889f50490cc..dab7ddf04b8609d75fc06f6cf12c2cde3fdbd7e9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -266,7 +266,7 @@ import javax.annotation.Nullable; // Paper
+@@ -266,7 +266,8 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
 
  public final class CraftServer implements Server {
--    private final String serverName = "Pufferfish"; // Paper // Pufferfish
+-    private final String serverName = io.papermc.paper.ServerBuildInfo.buildInfo().brandName(); // Paper
++    //private final String serverName = io.papermc.paper.ServerBuildInfo.buildInfo().brandName(); // Paper
 +    private final String serverName = "Papyrus"; // Papyrus // Paper // Pufferfish
      private final String serverVersion;
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index 80553face9c70c2a3d897681e7761df85b22d464..efeee36665ddf6e76186452bf2e7bac069d1cc6b 100644
+index 774556a62eb240da42e84db4502e2ed43495be17..990e41084ee68e3e000ba6cd4e2032045a0db021 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-@@ -11,7 +11,7 @@ public final class Versioning {
+@@ -10,8 +10,8 @@ import org.bukkit.Bukkit;
+ public final class Versioning {
      public static String getBukkitVersion() {
          String result = "Unknown-Version";
-
--        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/gg.pufferfish.pufferfish/pufferfish-api/pom.properties"); // Pufferfish
+-
+-        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/io.papermc.paper/paper-api/pom.properties");
++        //InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/io.papermc.paper/paper-api/pom.properties");
 +        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/de.erethon.papyrus/papyrus-api/pom.properties"); // Pufferfish
          Properties properties = new Properties();