Updated Upstream (Leaf)

Author: Pascalpex

.github/workflows/build.yml

@@ -21,7 +21,7 @@ jobs:
     - name: Generate Paperclip Jar
       run: ./gradlew createMojmapPaperclipJar
     - name: Upload Paperclip
-      uses: actions/upload-artifact@v4.6.2
+      uses: actions/upload-artifact@v5.0.0
       with:
         name: DeepslateMC
         path: deepslateMC-server/build/libs/deepslateMC-paperclip-1.21.8-R0.1-SNAPSHOT-mojmap.jar

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

@@ -30,10 +30,10 @@ index 02c02314a4a6a7a6da427f0d064dbc61ce92301d..2a0385f0c7f99ac960982211fd2b85c1
              if (gameModeForPlayer == GameType.CREATIVE) {
                  this.player.resetCurrentImpulseContext();
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index b8356e6719c17020627a693f62e70c2ae066e5ea..2d0d8bd3cf88a45361e0fee819e488ff1dec8816 100644
+index 527990be76068bf58fbb2e6e3901f64ed266f474..b0c14cac56b8717831348a38ba9ff73260689d4e 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
-@@ -496,6 +496,25 @@ public abstract class PlayerList {
+@@ -495,6 +495,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 b8356e6719c17020627a693f62e70c2ae066e5ea..2d0d8bd3cf88a45361e0fee819e488ff
              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);
-@@ -504,7 +523,13 @@ public abstract class PlayerList {
+@@ -503,7 +522,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 b8356e6719c17020627a693f62e70c2ae066e5ea..2d0d8bd3cf88a45361e0fee819e488ff
                          // Paper start - Add Listing API for Player
                      } else {
                          entityplayer1.connection.send(ClientboundPlayerInfoUpdatePacket.createSinglePlayerInitializing(player, false));
-@@ -520,7 +545,27 @@ public abstract class PlayerList {
+@@ -519,7 +544,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/server/MinecraftServer.java.patch

@@ -1,14 +1,14 @@
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1207,6 +_,7 @@
+@@ -1206,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
              Arrays.fill(this.recentTps, 20);
              // Paper start - further improve server tick loop
              long tickSection = Util.getNanos();
-@@ -1665,6 +_,19 @@
+@@ -1664,6 +_,19 @@
      private ServerStatus.Players buildPlayerStatus() {
          List<ServerPlayer> players = this.playerList.realPlayers; // Leaves - only real player
          int maxPlayers = this.getMaxPlayers();
@@ -28,7 +28,7 @@
          if (this.hidesOnlinePlayers()) {
              return new ServerStatus.Players(maxPlayers, players.size(), List.of());
          } else {
-@@ -2099,7 +_,18 @@
+@@ -2096,7 +_,18 @@
 
      public void setMotd(String motd) {
          // Paper start - Adventure

deepslateMC-server/minecraft-patches/sources/net/minecraft/server/players/PlayerList.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
-@@ -462,6 +_,19 @@
+@@ -461,6 +_,19 @@
              player.containerMenu.transferTo(player.containerMenu, bukkitPlayer);
 
              org.bukkit.event.player.PlayerJoinEvent playerJoinEvent = new org.bukkit.event.player.PlayerJoinEvent(bukkitPlayer, getJoinMsg(mutableComponent, bukkitPlayer)); // Paper - Adventure // Leaf - Configurable connection message - join message

gradle.properties

@@ -1,7 +1,7 @@
 group=de.pascalpex.deepslatemc
 version=1.21.8-R0.1-SNAPSHOT
 mcVersion=1.21.8
-leafRef=525fdd586f061bcbc7882aae1b79c642a7bafe9e
+leafRef=74d1b53d9f2de090b90659ea38a4f589a8d7a3f8
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true