Updated Upstream (Leaf)

Author: Pascalpex

.github/workflows/build.yml

@@ -4,7 +4,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.2.2
+    - uses: actions/checkout@v5.0.0
     - name: Set up JDK 21
       uses: actions/[email protected]
       with:

build-data/dev-imports.txt

@@ -4,7 +4,4 @@
 # both fully qualified and a file based syntax are accepted for <fileName>:
 #     authlib com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
 #     datafixerupper com.mojang.datafixers.DataFixerBuilder
-#     datafixerupper com/mojang/datafixers/util/Either.java
-# To import classes from the vanilla Minecraft jar use `minecraft` as the artifactId:
-#     minecraft net.minecraft.world.level.entity.LevelEntityGetterAdapter
-#     minecraft net/minecraft/world/level/entity/LevelEntityGetter.java
+#     datafixerupper com/mojang/datafixers/util/Either.java

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 {
-@@ -2089,7 +_,18 @@
+@@ -2094,7 +_,18 @@
 
      public void setMotd(String motd) {
          // Paper start - Adventure

gradle.properties

@@ -1,7 +1,7 @@
 group=de.pascalpex.deepslatemc
 version=1.21.8-R0.1-SNAPSHOT
 mcVersion=1.21.8
-leafRef=86c87e1ba03840470ed21d6dc872463a9d579edf
+leafRef=fad6c18ca15b8e2b0482756945dfc1b0883b5d5c
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true