Updated Upstream (Purpur)

.gitignore

@@ -1,53 +1,23 @@
-.gradle/
-export
-
-# Eclipse stuff
-.classpath
-.project
-.settings/
-
-# VSCode stuff
-.vscode/
-
-# netbeans
-nbproject/
-nbactions.xml
-
-# we use maven!
-build.xml
-
-# maven
-target/
-dependency-reduced-pom.xml
-
-# vim
-.*.sw[a-p]
-
-# various other potential build files
-build/
-bin/
-dist/
-manifest.mf
-
 # Mac filesystem dust
 .DS_Store/
 .DS_Store
 
-# intellij
-*.iml
-*.ipr
-*.iws
-.idea/
-out/
-
 # Linux temp files
 *~
 
-# other stuff
-run/
+# IntelliJ
+*.iml
+.idea
 
-mirai-server
-mirai-api
+# Gradle
+!gradle/wrapper/gradle-wrapper.jar
+.gradle
+build
 
+# Mirai
+build-data
+run
 
-!gradle/wrapper/gradle-wrapper.jar
+mirai-server
+mirai-api
+paper-api-generator

build.gradle.kts

@@ -13,7 +13,7 @@ repositories {
 }
 
 dependencies {
-    remapper("net.fabricmc:tiny-remapper:0.9.0:fat")
+    remapper("net.fabricmc:tiny-remapper:0.10.1:fat")
     decompiler("org.vineflower:vineflower:1.9.3")
     paperclip("io.papermc:paperclip:3.0.4-SNAPSHOT")
 }
@@ -72,5 +72,12 @@ paperweight {
             apiOutputDir.set(layout.projectDirectory.dir("mirai-api"))
             serverOutputDir.set(layout.projectDirectory.dir("mirai-server"))
         }
+
+        patchTasks.register("generatedApi") {
+            isBareDirectory = true
+            upstreamDirPath = "paper-api-generator/generated"
+            patchDir = layout.projectDirectory.dir("patches/generated-api")
+            outputDir = layout.projectDirectory.dir("paper-api-generator/generated")
+        }
     }
 }

gradle.properties

@@ -6,4 +6,4 @@ org.gradle.jvmargs = -Xmx4G
 group=dev.etil.mirai
 version=1.20.4-R0.1-SNAPSHOT
 mcVersion=1.20.4
-purpurRef=837307112c59ca5070a208741adbd44c01709431
+purpurRef=770fbe66e095ee36ca4a5c0d3ea8b26a0eb5efab

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 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.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

patches/api/0001-Mirai-Configuration.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Mirai Configuration
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 529fb1beadefc79ce6bf5755d5223301b9933152..213b8e86a5e5fae961000141a2bc35e45488ca92 100644
+index be0e4c789a02d67160287c39cf6bdf8ef2229afc..08819cb04c30fb10089961ac927b154480aee130 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2210,6 +2210,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2226,6 +2226,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
          // Purpur end
 

patches/api/0003-Add-last-tick-time-API.patch

@@ -7,10 +7,10 @@ Original code by YatopiaMC, licensed under MIT
 You can find the original code on https://github.com/YatopiaMC/Yatopia
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 109304f8064ab2fab57f9c0f1745e446e6748b3d..f592af9aba6ab7fcbad331cfd30dfb5de26c424d 100644
+index d218cd30fc0733a83e3e0ba3279eb21561b0b08e..8f9e421bf367fca51d0d7e9e1b6dc5e364ee6f7e 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2675,6 +2675,16 @@ public final class Bukkit {
+@@ -2695,6 +2695,16 @@ public final class Bukkit {
          return server.isStopping();
      }
 
@@ -28,10 +28,10 @@ index 109304f8064ab2fab57f9c0f1745e446e6748b3d..f592af9aba6ab7fcbad331cfd30dfb5d
       * Returns the {@link com.destroystokyo.paper.entity.ai.MobGoals} manager
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 213b8e86a5e5fae961000141a2bc35e45488ca92..ada5e36e387965d00b2b0b29ae261bac3b4c9d23 100644
+index 08819cb04c30fb10089961ac927b154480aee130..18f4dc4f0e42416ea2ec74c2fa3af36ba17ed83c 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2364,6 +2364,26 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2380,6 +2380,26 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      boolean isStopping();
 

patches/api/0007-Smooth-Teleports.patch

@@ -7,10 +7,10 @@ Original code by Cryptite, licensed under MIT
 You can find the original code on 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 3aa79be25d63f704170baaf799482ccdde6a2830..00cb670c0c8e38531ace502b7cbc1159c6b4a27a 100644
+index 6dc63bfe85d83a7cff369f06c57ebe0aa04c63a3..2e46cc13c806e66e08cc353a3c2f4809c06d5a07 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3437,6 +3437,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3550,6 +3550,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      String getClientBrandName();
      // Paper end
 

patches/server/0001-Mirai-Branding-Changes.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Mirai Branding Changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 790835a0c4889d17b4efd06cb463744973642a48..69a7dc227b396a774d8a8c361e86b498d40d7b61 100644
+index 0c92d10f334f82d196e065c0811d0c1f48887377..a6edbc672e4a226101abe0625e09dc70568606bf 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -14,7 +14,7 @@ val alsoShade: Configuration by configurations.creating
@@ -17,7 +17,7 @@ index 790835a0c4889d17b4efd06cb463744973642a48..69a7dc227b396a774d8a8c361e86b498
      implementation("io.papermc.paper:paper-mojangapi:${project.version}") {
          exclude("io.papermc.paper", "paper-api")
      }
-@@ -93,7 +93,7 @@ tasks.jar {
+@@ -92,7 +92,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
@@ -375,10 +375,10 @@ index 0000000000000000000000000000000000000000..127b51d61ab6a4cfbdd8580216279aa1
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f69976dcba060027c67c2e1b49fa28d3f28f66f0..50be99ebd55fad268e5aeba1fbac2f8dee1b58da 100644
+index b1dd8d66a524254a270a725f5f7a46f28e13b749..67865e4f4ca809424bf2792f52fd6a0a2b85a7ff 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -959,7 +959,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -956,7 +956,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          shutdownThread = Thread.currentThread();
          org.spigotmc.WatchdogThread.doStop(); // Paper
          if (!isSameThread()) {
@@ -388,10 +388,10 @@ index f69976dcba060027c67c2e1b49fa28d3f28f66f0..50be99ebd55fad268e5aeba1fbac2f8d
                  this.getRunningThread().stop();
                  try {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index aef22db014c81332ba599ddb931afb264dc12a84..c55e428c46705e7fa99022fd2bf6dc81074e9b1e 100644
+index 0a5867b01c1ebf21d9add1d4a2843d15b8e1acb7..5b2e55e69235353404cd4f1cbf081f0199e3262c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -264,7 +264,7 @@ import javax.annotation.Nullable; // Paper
+@@ -266,7 +266,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
 
  public final class CraftServer implements Server {
@@ -401,10 +401,10 @@ index aef22db014c81332ba599ddb931afb264dc12a84..c55e428c46705e7fa99022fd2bf6dc81
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 6eeebfaf577263316f3562a8f968310acd616763..b6e65cfa61804a52e5e1e3709bfc760984a00a99 100644
+index d5f642e4b1c1ede7e9d2dea072aa5f22c73b5c23..8d05af0c550f4560e54aa5f93822e3216c50a7a8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -482,7 +482,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -497,7 +497,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
 
      @Override
      public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
@@ -464,7 +464,7 @@ index e9fc2b4661f5275b93db5d3fdf25a8bdc3b38920..96ac209d91ddb3d3123daee664502ac4
          serverModName = getString("settings.server-mod-name", serverModName);
      }
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 5fc8cc40ab627eba0b2110c73d31af213a935733..15d89290388f2a746896ebc7dc900bba3b829747 100644
+index f7296691cb4af7814de1520347b307ff209082e4..abc6b7f67cc2cc711f183081afe860cb6bc5b0b5 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -155,14 +155,14 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
@@ -485,7 +485,7 @@ index 5fc8cc40ab627eba0b2110c73d31af213a935733..15d89290388f2a746896ebc7dc900bba
                  //
                  if ( net.minecraft.world.level.Level.lastPhysicsProblem != null )
                  {
-@@ -185,12 +185,12 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
+@@ -184,12 +184,12 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
                  // Paper end
                  } else
                  {
@@ -497,10 +497,10 @@ index 5fc8cc40ab627eba0b2110c73d31af213a935733..15d89290388f2a746896ebc7dc900bba
                  log.log( Level.SEVERE, "------------------------------" );
 -                log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Purpur!):" ); // Paper // Purpur
 +                log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Mirai!):" ); // Paper // Purpur // Mirai
-                 io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.dumpAllChunkLoadInfo(isLongTimeout); // Paper // Paper - rewrite chunk system
+                 io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.dumpAllChunkLoadInfo(isLongTimeout); // Paper - rewrite chunk system
                  this.dumpTickingInfo(); // Paper - log detailed tick information
                  WatchdogThread.dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log );
-@@ -206,7 +206,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
+@@ -205,7 +205,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
                      WatchdogThread.dumpThread( thread, log );
                  }
                  } else {

patches/server/0002-Mirai-Configuration.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Mirai Configuration
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 69a7dc227b396a774d8a8c361e86b498d40d7b61..0c151c51ca0ba7a5d6e0543e341c93bfceafd712 100644
+index a6edbc672e4a226101abe0625e09dc70568606bf..15994643852c5d90ddb1bb8553b0290ba771f674 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -66,6 +66,15 @@ dependencies {
+@@ -65,6 +65,15 @@ dependencies {
      implementation("org.mozilla:rhino-engine:1.7.14") // Purpur
      implementation("dev.omega24:upnp4j:1.0") // Purpur
 
@@ -25,10 +25,10 @@ index 69a7dc227b396a774d8a8c361e86b498d40d7b61..0c151c51ca0ba7a5d6e0543e341c93bf
      testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
      testImplementation("org.hamcrest:hamcrest:2.2")
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index ff940e43ca35094bbcae6c7d471d3c4aeb7c1727..91886b59dc8e97f93b9b1f004781e4b8076595b0 100644
+index b35a9f4c5f8960864c402ede8a51fb5ab9c4fcc0..cf775afd8dd8ae4096dd6c3879505da240065f80 100644
 --- a/src/main/java/co/aikar/timings/TimingsExport.java
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
-@@ -243,7 +243,8 @@ public class TimingsExport extends Thread {
+@@ -241,7 +241,8 @@ public class TimingsExport extends Thread {
              pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
              pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
              pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)), // Pufferfish
@@ -262,7 +262,7 @@ index 0000000000000000000000000000000000000000..d4e242b74f77e29099421450ced16481
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index d21260dd1b7305949f063123b427dec1f5a00ae5..dbb0cb8babafb239921acc09899ab5664709e16e 100644
+index 3a57462e7945fd55e00448f6625d287d97cc93ec..bdb06d4d992c9c191bd904972b74c6d8a770af67 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -235,6 +235,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface