Add Purpur

patches/api/0003-Leaf-config-files.patch

@@ -5,12 +5,12 @@ Subject: [PATCH] Leaf config files
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 6253e761c595c8b89d08f9d42fe3e19cadbf4918..66740fa8e37204c3f7f9275b45f398d80f2ff44e 100644
+index bb4452abd1e6b169d03e77a6b6bdec813f300e1d..d772a989c4bd2d7540f3f41c4576b36835d26f12 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2021,6 +2021,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
- 
-         // Paper end
+@@ -2033,6 +2033,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+         }
+         // Purpur end
  
 +        // Leaf start
 +        @NotNull

patches/api/0004-Bump-Dependencies.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index e23ed86c4288ecdfef37bf5b2cd132f348bf852a..733236d0cde112d99b017f67f44d982396ffa352 100644
+index 3e148458cc78a3225e8d6572b43e1d358791eec2..8813d67ff64f4f213de223c17cd16ef21aa9c916 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -24,15 +24,17 @@ configurations.api {
@@ -79,7 +79,7 @@ index e23ed86c4288ecdfef37bf5b2cd132f348bf852a..733236d0cde112d99b017f67f44d9823
  }
  
  configure<PublishingExtension> {
-@@ -113,9 +117,11 @@ tasks.withType<Javadoc> {
+@@ -115,9 +119,11 @@ tasks.withType<Javadoc> {
      options.use()
      options.isDocFilesSubDirs = true
      options.links(
@@ -92,7 +92,7 @@ index e23ed86c4288ecdfef37bf5b2cd132f348bf852a..733236d0cde112d99b017f67f44d9823
          // Paper start
          //"https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", // don't link to bungee chat
          "https://jd.advntr.dev/api/$adventureVersion/",
-@@ -156,6 +162,9 @@ val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.
+@@ -158,6 +164,9 @@ val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.
      jarToScan.set(tasks.jar.flatMap { it.archiveFile })
      classpath.from(configurations.compileClasspath)
  }

patches/api/0006-KeYi-Player-Skull-API.patch

@@ -7,7 +7,7 @@ Original license: MIT
 Original project: https://github.com/KeYiMC/KeYi
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index af82b2d96080c0657371d80a36192f937c5975bb..c186ffee39328d94f4dfc2d000602f40e829e324 100644
+index f5e2e1bdd31e74fdc00da5b503b178350e8235cd..801ac3e3b75a92121d7f50d9df8e1e227abadbae 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -4,7 +4,10 @@ import java.net.InetSocketAddress;
@@ -22,10 +22,10 @@ index af82b2d96080c0657371d80a36192f937c5975bb..c186ffee39328d94f4dfc2d000602f40
  import org.bukkit.DyeColor;
  import org.bukkit.Effect;
  import org.bukkit.GameMode;
-@@ -3047,4 +3050,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-     @Override
-     Spigot spigot();
-     // Spigot end
+@@ -3182,4 +3185,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+      */
+     void sendDeathScreen(@NotNull net.kyori.adventure.text.Component message, @Nullable Entity killer);
+     // Purpur end
 +
 +    // KeYi start
 +    /**

patches/api/0007-Slice-Smooth-Teleports.patch

@@ -7,7 +7,7 @@ Original license: MIT
 Original project: https://github.com/Cryptite/Slice
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index c186ffee39328d94f4dfc2d000602f40e829e324..a236d15a618ec2b9b63b66fb67bb8a86206b43e3 100644
+index 801ac3e3b75a92121d7f50d9df8e1e227abadbae..23b53929b3333bab04bd1aad1873d14e7d6ef54d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2932,6 +2932,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

patches/server/0001-Rebrand.patch

@@ -40,7 +40,7 @@ index e45e6b44b2a8f2cdae6e0048a812b92126aa17ca..b5f3f213da8a40d5184098af017c8e26
                  .completer(new ConsoleCommandCompleter(this.server))
                  .option(LineReader.Option.COMPLETE_IN_WORD, true);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0782da72420e6988728a699af420fd17e5828e06..ae454d874b6eea828d5491fc585d3dd7fa87ba8f 100644
+index 5db4312ed1973a2395af66975a43abe5beffa1cd..1c671eb71254172fe023eb81cda21976d861a81f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1030,7 +1030,7 @@ public abstract class MinecraftServer extends MinecraftServerBlockableEventLoop
@@ -52,17 +52,8 @@ index 0782da72420e6988728a699af420fd17e5828e06..ae454d874b6eea828d5491fc585d3dd7
              // Gale end - branding changes
              // Gale start - base thread pool
              while (serverThread.isAlive()) {
-@@ -1880,7 +1880,7 @@ public abstract class MinecraftServer extends MinecraftServerBlockableEventLoop
- 
-     @DontObfuscate
-     public String getServerModName() {
--        return "Gale"; // Gale - branding changes - Gale > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
-+        return "Leaf"; // Leaf - Leaf > // Gale - branding changes - Gale > // 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 49ec0bd654e063b21d9673a17ed3df9b9e7f2242..76e96b8a57bb84b92abc7932b8fed2950aaa87bb 100644
+index f903aa3d94505af701bb7f16269f7a25e5ab3044..586bb5f9b98594d29731e52760c74b7390d330d5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -261,7 +261,7 @@ import javax.annotation.Nullable; // Paper

patches/server/0008-Purpur-Base.patch

@@ -0,0 +1,98 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Github Actions <no-reply@github.com>
+Date: Wed, 24 May 2023 06:00:03 +0800
+Subject: [PATCH] Purpur Base
+
+Original license: MIT
+Original project: https://github.com/PurpurMC/Purpur
+
+diff --git a/build.gradle.kts b/build.gradle.kts
+index 493acdeeb56ed13a0c30d9d10b2f9171df296d98..3c1e97fb031f7cdf73ecb6cf8ec662e08b78f96f 100644
+--- a/build.gradle.kts
++++ b/build.gradle.kts
+@@ -45,6 +45,10 @@ dependencies {
+     }
+     // Paper end
+ 
++    implementation("org.mozilla:rhino-runtime:1.7.14") // Purpur
++    implementation("org.mozilla:rhino-engine:1.7.14") // Purpur
++    implementation("dev.omega24:upnp4j:1.0") // Purpur
++
+     runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5")
+     runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
+     runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
+@@ -168,7 +172,7 @@ fun TaskContainer.registerRunTask(
+         }
+     }
+     // Gale end - use default Java installation for development runs
+-    group = "paper"
++    group = "paperweight" // Purpur
+     mainClass.set("org.bukkit.craftbukkit.Main")
+     standardInput = System.`in`
+     workingDir = rootProject.layout.projectDirectory
+diff --git a/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java
+index 4e56018b64d11f76c8da43fd8f85c6de72204e36..aa8212432825db65cf485cd93f734ccd9eefcb5a 100644
+--- a/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java
++++ b/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java
+@@ -21,7 +21,12 @@ public class CraftConsoleCommandSender extends ServerCommandSender implements Co
+ 
+     @Override
+     public void sendMessage(String message) {
+-        this.sendRawMessage(message);
++        // Purpur start
++        String[] parts = message.split("\n");
++        for (String part : parts) {
++            this.sendRawMessage(part);
++        }
++        // Purpur end
+     }
+ 
+     @Override
+@@ -91,7 +96,7 @@ public class CraftConsoleCommandSender extends ServerCommandSender implements Co
+     // Paper start
+     @Override
+     public void sendMessage(final net.kyori.adventure.identity.Identity identity, final net.kyori.adventure.text.Component message, final net.kyori.adventure.audience.MessageType type) {
+-        this.sendRawMessage(net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().serialize(message));
++        this.sendMessage(net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().serialize(message)); // Purpur
+     }
+ 
+     @Override
+diff --git a/src/main/java/org/galemc/gale/version/AbstractPaperVersionFetcher.java b/src/main/java/org/galemc/gale/version/AbstractPaperVersionFetcher.java
+index 7fee1c2779ab390586b2d3f75f56890846323500..5fdb227acfd1d8f55b770c8a66e97494c36db33c 100644
+--- a/src/main/java/org/galemc/gale/version/AbstractPaperVersionFetcher.java
++++ b/src/main/java/org/galemc/gale/version/AbstractPaperVersionFetcher.java
+@@ -68,7 +68,7 @@ public abstract class AbstractPaperVersionFetcher implements VersionFetcher {
+         // Gale end - branding changes - version fetcher
+         final Component history = getHistory();
+ 
+-        return history != null ? TextComponent.ofChildren(updateMessage, Component.newline(), history) : updateMessage;
++        return history != null ? Component.join(net.kyori.adventure.text.JoinConfiguration.separator(Component.newline()), history, updateMessage) : updateMessage; // Purpur
+     }
+ 
+     protected @Nullable String getMinecraftVersion() { // Gale - branding changes - version fetcher
+@@ -120,13 +120,13 @@ public abstract class AbstractPaperVersionFetcher implements VersionFetcher {
+ 
+         switch (distance) {
+             case -1:
+-                return Component.text("Error obtaining version information", NamedTextColor.YELLOW);
++                return Component.text("* Error obtaining version information", NamedTextColor.RED); // Purpur
+             case 0:
+-                return Component.text("You are running the latest version", NamedTextColor.GREEN);
++                return Component.text("* You are running the latest version", NamedTextColor.GREEN); // Purpur
+             case -2:
+-                return Component.text("Unknown version", NamedTextColor.YELLOW);
++                return Component.text("* Unknown version", NamedTextColor.YELLOW); // Purpur
+             default:
+-                return Component.text("You are " + distance + " version(s) behind", NamedTextColor.YELLOW)
++                return Component.text("* You are " + distance + " version(s) behind", NamedTextColor.YELLOW) // Purpur
+                         .append(Component.newline())
+                         .append(Component.text("Download the new version at: ")
+                                 .append(Component.text(this.downloadPage, NamedTextColor.GOLD) // Gale - branding changes - version fetcher
+@@ -174,6 +174,6 @@ public abstract class AbstractPaperVersionFetcher implements VersionFetcher {
+             return null;
+         }
+ 
+-        return Component.text("Previous version: " + oldVersion, NamedTextColor.GRAY, TextDecoration.ITALIC);
++        return org.bukkit.ChatColor.parseMM("<grey>Previous: %s", oldVersion); // Purpur
+     }
+ }

patches/server/0009-Bump-Dependencies.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 493acdeeb56ed13a0c30d9d10b2f9171df296d98..ba66cd2f91ba69d6e10d542610a58fd2b403671c 100644
+index 3c1e97fb031f7cdf73ecb6cf8ec662e08b78f96f..12b91410d3f0afd5882960563bf54b59e8c42b5e 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -11,13 +11,13 @@ dependencies {
@@ -25,7 +25,7 @@ index 493acdeeb56ed13a0c30d9d10b2f9171df296d98..ba66cd2f91ba69d6e10d542610a58fd2
      implementation("net.minecrell:terminalconsoleappender:1.3.0")
      /*
            Required to add the missing Log4j2Plugins.dat file from log4j-core
-@@ -25,42 +25,47 @@ dependencies {
+@@ -25,22 +25,24 @@ dependencies {
            all its classes to check if they are plugins.
            Scanning takes about 1-2 seconds so adding this speeds up the server start.
       */
@@ -59,6 +59,9 @@ index 493acdeeb56ed13a0c30d9d10b2f9171df296d98..ba66cd2f91ba69d6e10d542610a58fd2
          isTransitive = false
      }
      // Paper end
+@@ -49,22 +51,25 @@ dependencies {
+     implementation("org.mozilla:rhino-engine:1.7.14") // Purpur
+     implementation("dev.omega24:upnp4j:1.0") // Purpur
  
 -    runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5")
 -    runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
@@ -89,7 +92,7 @@ index 493acdeeb56ed13a0c30d9d10b2f9171df296d98..ba66cd2f91ba69d6e10d542610a58fd2
  }
  
  val craftbukkitPackageVersion = "1_19_R3" // Paper
-@@ -227,3 +232,6 @@ tasks.registerRunTask("runDev") {
+@@ -231,3 +236,6 @@ tasks.registerRunTask("runDev") {
      description = "Spin up a non-relocated Mojang-mapped test server"
      classpath(sourceSets.main.map { it.runtimeClasspath })
  }

patches/server/0028-Leaves-Appleskin-Protocol.patch

@@ -7,7 +7,7 @@ Original license: GPLv3
 Original project: https://github.com/LeavesMC/Leaves
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2c23f420bcfecbc3d1b5edabacee981c6ff2349e..356c5bdf6257be75f40aca6099661096d078b9e2 100644
+index b39d799026efbfaf659471e58cfaa9210f0902b9..6318194ba2a9148f4c2798385febfaab4ace094b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1612,6 +1612,7 @@ public abstract class MinecraftServer extends MinecraftServerBlockableEventLoop
@@ -70,7 +70,7 @@ index 1718e70b56898865d41846a60cf4c514f8b0ee13..14121b31c8918318b7936ca74f708a20
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
              world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
 diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java
-index 657e5ab36a985da5945776cfe797cdfddd826f10..c9144eca8c6b59dfb37f9cc3f8f95ff65c3d75bc 100644
+index f77a8b729846dc9be3adad659ccc02df0467cd9e..2e3a7d57996532259d9559da9451df9fd58e9ccb 100644
 --- a/src/main/java/org/dreeam/leaf/LeafConfig.java
 +++ b/src/main/java/org/dreeam/leaf/LeafConfig.java
 @@ -250,7 +250,9 @@ public class LeafConfig {

patches/server/0029-Leaves-Xaero-Map-Protocol.patch

@@ -19,7 +19,7 @@ index 43ee9e37b4ac640df35de60b1496a52e81896321..a126c05b99916bf308982d57212957b3
              // CraftBukkit start - handle player weather
              // entityplayer.connection.send(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.START_RAINING, 0.0F));
 diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java
-index c9144eca8c6b59dfb37f9cc3f8f95ff65c3d75bc..6a11a916281d86b1e7f29dfa394ae1a4575b27fa 100644
+index 2e3a7d57996532259d9559da9451df9fd58e9ccb..076234351d6a6647f017ed4e46a0554ae6053151 100644
 --- a/src/main/java/org/dreeam/leaf/LeafConfig.java
 +++ b/src/main/java/org/dreeam/leaf/LeafConfig.java
 @@ -19,6 +19,7 @@ import java.util.Collections;