Updated Upstream (Dreeam)

Author: Pascalpex

build.gradle.kts

@@ -2,7 +2,7 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
-    id("io.papermc.paperweight.patcher") version "2.0.0-beta.18"
+    id("io.papermc.paperweight.patcher") version "2.0.0-beta.19"
 }
 
 paperweight {

deepslateMC-server/build.gradle.kts.patch

@@ -56,7 +56,7 @@
 
      // Leaf start - Libraries
      implementation("com.github.thatsmusic99:ConfigurationMaster-API:v2.0.0-rc.3") { // Leaf config
-@@ -270,14 +_,14 @@
+@@ -271,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/sources/net/minecraft/server/dedicated/DedicatedServer.java.patch

@@ -1,9 +1,9 @@
 --- a/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -187,6 +_,8 @@
+@@ -186,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
-         org.dreeam.leaf.command.LeafCommands.registerCommands(this); // Leaf - Leaf commands
 +        de.pascalpex.deepslatemc.commands.DeepslateCmdRegisterer.registerCommands(this); // Deepslate - register commands
 +        de.pascalpex.deepslatemc.util.ActionbarUtil.reloadActionbar(); // Deepslate - load actionbar
          this.server.spark.registerCommandBeforePlugins(this.server); // Paper - spark

deepslateMC-server/paper-patches/files/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java.patch

@@ -3,7 +3,7 @@
 @@ -37,6 +_,7 @@
      private static final String BRAND_PURPUR_NAME = "Purpur";
      private static final String BRAND_LEAF_NAME = "Leaf";
-     // Leaf end - Rebrand & Fix Pufferfish and Purpur patches
+     // Leaf end - Rebrand
 +    private static final String BRAND_DEEPSLATE_NAME = "DeepslateMC"; // Deepslate
 
      private static final String BUILD_DEV = "DEV";
@@ -27,6 +27,6 @@
 -            || brandId.equals(BRAND_PURPUR_ID);
 +            || brandId.equals(BRAND_PURPUR_ID)
 +            || brandId.equals(BRAND_LEAF_ID); // Deepslate
-             // Leaf end - Rebrand & Fix Pufferfish and Purpur patches
+             // Leaf end - Rebrand
      }
 

gradle.properties

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