Updated Upstream (Leaf)

Author: Pascalpex

deepslateMC-server/minecraft-patches/sources/net/minecraft/CrashReport.java.patch

@@ -8,4 +8,4 @@
 +    private List<String> extraInfo = List.of("", "DO NOT REPORT THIS TO PAPER! REPORT TO DEEPSLATEMC INSTEAD!", ""); // Leaf - Rebrand // Deepslate
 
      public CrashReport(String title, Throwable exception) {
-         io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(exception); // Paper
+         this.title = title;

deepslateMC-server/minecraft-patches/sources/net/minecraft/server/Main.java.patch

@@ -15,6 +15,6 @@
 +                "                     | |                                             \n" +
 +                "                     |_|                                             \u001B[0m\u001B[1;31m\u001B[0m\u001B[1;31m\u001B[0m\u001B[0m\n");
 +        // Deepslate end - Startup branding
-         io.papermc.paper.util.LogManagerShutdownThread.hook(); // Paper - Improved watchdog support
+         io.papermc.paper.log.LogManagerShutdownThread.hook(); // Paper - Improved watchdog support
          SharedConstants.tryDetectVersion();
          /* CraftBukkit start - Replace everything

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

@@ -1,14 +1,14 @@
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1357,6 +_,7 @@
+@@ -1352,6 +_,7 @@
              // Paper end
              org.spigotmc.WatchdogThread.hasStarted = true; // Paper
              org.dreeam.leaf.config.LeafConfig.regSparkExtraConfig(); // Leaf - Leaf config
 +            de.pascalpex.deepslatemc.files.Config.addSparkEntry(); // Deepslate - add deepslate.yml to spark
              // Paper start - Add onboarding message for initial server start
              if (io.papermc.paper.configuration.GlobalConfiguration.isFirstStart) {
                  LOGGER.info("*************************************************************************************");
-@@ -1840,6 +_,19 @@
+@@ -1835,6 +_,19 @@
      private ServerStatus.Players buildPlayerStatus() {
          List<ServerPlayer> players = this.playerList.getPlayers();
          int maxPlayers = this.getMaxPlayers();
@@ -28,7 +28,7 @@
          if (this.hidesOnlinePlayers()) {
              return new ServerStatus.Players(maxPlayers, players.size(), List.of());
          } else {
-@@ -2268,12 +_,29 @@
+@@ -2263,12 +_,29 @@
 
      @Override
      public String getMotd() {

gradle.properties

@@ -2,7 +2,7 @@ group=de.pascalpex.deepslatemc
 version=1.21.11-R0.1-SNAPSHOT
 mcVersion=1.21.11
 apiVersion=1.21.11
-leafRef=9773e401a0107a453af95f54a153a8b27f012253
+leafRef=5baa6c1684039a3c347e7065122260a89626c407
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true