Prepare 1.21.11 update

Author: Pascalpex

.github/workflows/build.yml

@@ -24,4 +24,4 @@ jobs:
       uses: actions/[email protected]
       with:
         name: DeepslateMC
-        path: deepslateMC-server/build/libs/deepslateMC-paperclip-1.21.10-R0.1-SNAPSHOT-mojmap.jar
+        path: deepslateMC-server/build/libs/deepslateMC-paperclip-1.21.11-rc1-R0.1-SNAPSHOT-mojmap.jar

deepslateMC-api/build.gradle.kts.patch

@@ -1,6 +1,6 @@
 --- a/purpur-api/build.gradle.kts
 +++ b/purpur-api/build.gradle.kts
-@@ -100,17 +_,21 @@
+@@ -102,17 +_,21 @@
          java {
              srcDir(generatedDir)
              srcDir(file("../paper-api/src/main/java"))

deepslateMC-server/build.gradle.kts.patch

@@ -1,6 +1,6 @@
 --- a/purpur-server/build.gradle.kts
 +++ b/purpur-server/build.gradle.kts
-@@ -33,7 +_,30 @@
+@@ -32,7 +_,30 @@
              outputDir = rootDirectory.dir("paper-server")
          }
      }
@@ -56,7 +56,7 @@
      implementation("ca.spottedleaf:concurrentutil:0.0.7")
      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
-@@ -228,14 +_,14 @@
+@@ -229,14 +_,14 @@
          val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim()
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",

deepslateMC-server/minecraft-patches/features/0001-Dont-show-spectator-players-in-tablist.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Dont show spectator players in tablist
 
 
 diff --git a/net/minecraft/server/level/ServerPlayerGameMode.java b/net/minecraft/server/level/ServerPlayerGameMode.java
-index fad600f343ee0983efc183f083b1507648987575..cc7de938b0b47440f23d1a48d1173bbada4ad665 100644
+index 2e3b6da733387c95c0add1f7a42508023f0b74ff..f0abe276540d1ca7e6d43e9c365437a029a27870 100644
 --- a/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -86,10 +86,16 @@ public class ServerPlayerGameMode {
+@@ -84,10 +84,16 @@ public class ServerPlayerGameMode {
              }
 
              this.player.onUpdateAbilities();
@@ -30,10 +30,10 @@ index fad600f343ee0983efc183f083b1507648987575..cc7de938b0b47440f23d1a48d1173bba
              if (gameModeForPlayer == GameType.CREATIVE) {
                  this.player.resetCurrentImpulseContext();
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 7c6a0ae4b427abc557c91008cb9087ab34f4aa40..2e3de1727ebedaa398718c35399484242a236e5e 100644
+index 34d8495507f1607af805ba17f7d17cb7a0e6dcc8..6767cdbda355bb861f2743fec34b2b833e638a35 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
-@@ -263,6 +263,25 @@ public abstract class PlayerList {
+@@ -268,6 +268,25 @@ public abstract class PlayerList {
          // CraftBukkit start - sendAll above replaced with this loop
          ClientboundPlayerInfoUpdatePacket packet = ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(player)); // Paper - Add Listing API for Player
 
@@ -59,7 +59,7 @@ index 7c6a0ae4b427abc557c91008cb9087ab34f4aa40..2e3de1727ebedaa398718c3539948424
          final List<ServerPlayer> onlinePlayers = Lists.newArrayListWithExpectedSize(this.players.size() - 1); // Paper - Use single player info update packet on join
          for (int i = 0; i < this.players.size(); ++i) {
              ServerPlayer entityplayer1 = (ServerPlayer) this.players.get(i);
-@@ -271,7 +290,13 @@ public abstract class PlayerList {
+@@ -276,7 +295,13 @@ public abstract class PlayerList {
                  // Paper start - Add Listing API for Player
                  if (entityplayer1.getBukkitEntity().isListed(bukkitPlayer)) {
                      // Paper end - Add Listing API for Player
@@ -74,7 +74,7 @@ index 7c6a0ae4b427abc557c91008cb9087ab34f4aa40..2e3de1727ebedaa398718c3539948424
                      // Paper start - Add Listing API for Player
                  } else {
                      entityplayer1.connection.send(ClientboundPlayerInfoUpdatePacket.createSinglePlayerInitializing(player, false));
-@@ -287,7 +312,27 @@ public abstract class PlayerList {
+@@ -292,7 +317,27 @@ public abstract class PlayerList {
          }
          // Paper start - Use single player info update packet on join
          if (!onlinePlayers.isEmpty()) {

deepslateMC-server/minecraft-patches/sources/net/minecraft/commands/Commands.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/commands/Commands.java
 +++ b/net/minecraft/commands/Commands.java
-@@ -184,6 +_,10 @@
+@@ -193,6 +_,10 @@
      }
      public Commands(Commands.CommandSelection selection, CommandBuildContext context, final boolean modern) {
      // Paper end - Brigadier API - modern minecraft overloads that do not use redirects but are copies instead
@@ -11,7 +11,7 @@
          AdvancementCommands.register(this.dispatcher);
          AttributeCommand.register(this.dispatcher, context);
          ExecuteCommand.register(this.dispatcher, context);
-@@ -208,7 +_,7 @@
+@@ -217,7 +_,7 @@
          GameModeCommand.register(this.dispatcher);
          GameRuleCommand.register(this.dispatcher, context);
          GiveCommand.register(this.dispatcher, context);
@@ -20,7 +20,7 @@
          ItemCommands.register(this.dispatcher, context);
          KickCommand.register(this.dispatcher);
          KillCommand.register(this.dispatcher);
-@@ -276,7 +_,9 @@
+@@ -286,7 +_,9 @@
              BanListCommands.register(this.dispatcher);
              BanPlayerCommands.register(this.dispatcher);
              DeOpCommands.register(this.dispatcher);

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

@@ -1,7 +1,7 @@
 --- a/net/minecraft/server/Main.java
 +++ b/net/minecraft/server/Main.java
-@@ -67,6 +_,17 @@
-     )
+@@ -65,6 +_,17 @@
+     @SuppressForbidden(reason = "System.out needed before bootstrap")
      @DontObfuscate
      public static void main(final OptionSet optionSet) { // CraftBukkit - replaces main(String[] args)
 +        // Deepslate start - Startup branding

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
-@@ -1293,6 +_,7 @@
+@@ -1295,6 +_,7 @@
              org.spigotmc.WatchdogThread.tick();
              // Paper end
              org.spigotmc.WatchdogThread.hasStarted = true; // Paper
 +            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("*************************************************************************************");
-@@ -1746,6 +_,19 @@
+@@ -1759,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 {
-@@ -2152,7 +_,18 @@
+@@ -2140,7 +_,18 @@
 
      public void setMotd(String motd) {
          // Paper start - Adventure

deepslateMC-server/minecraft-patches/sources/net/minecraft/server/dedicated/DedicatedServer.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -275,6 +_,8 @@
+@@ -272,6 +_,8 @@
          org.spigotmc.WatchdogThread.doStart(org.spigotmc.SpigotConfig.timeoutTime, org.spigotmc.SpigotConfig.restartOnCrash); // Paper - start watchdog thread
          thread.start(); // Paper - Enhance console tab completions for brigadier commands; start console thread after MinecraftServer.console & PaperConfig are initialized
          io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command

deepslateMC-server/minecraft-patches/sources/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java
-@@ -106,9 +_,13 @@
+@@ -103,9 +_,13 @@
          new io.papermc.paper.event.connection.configuration.PlayerConnectionInitialConfigureEvent(this.paperConnection).callEvent(); // Paper
          this.send(new ClientboundCustomPayloadPacket(new BrandPayload(this.server.getServerModName())));
          ServerLinks serverLinks = this.server.serverLinks();

deepslateMC-server/minecraft-patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1565,7 +_,7 @@
+@@ -1589,7 +_,7 @@
                                              io.papermc.paper.event.player.PlayerFailMoveEvent event = fireFailMove(io.papermc.paper.event.player.PlayerFailMoveEvent.FailReason.MOVED_TOO_QUICKLY,
                                                      toX, toY, toZ, toYaw, toPitch, true);
                                              if (!event.isAllowed()) {
@@ -9,7 +9,7 @@
                                              LOGGER.warn("{} moved too quickly! {},{},{}", this.player.getPlainTextName(), d3, d4, d5);
                                                  }
                                                  this.teleport(
-@@ -1643,7 +_,7 @@
+@@ -1668,7 +_,7 @@
                                              toX, toY, toZ, toYaw, toPitch, true);
                                      if (!event.isAllowed()) {
                                          movedWrongly = true;