Include deepslate.yml in spark

Author: Pascalpex

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

@@ -1,5 +1,13 @@
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
+@@ -1208,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();
 @@ -1666,6 +_,19 @@
      private ServerStatus.Players buildPlayerStatus() {
          List<ServerPlayer> players = this.playerList.realPlayers; // Leaves - only real player

deepslateMC-server/src/main/java/de/pascalpex/deepslatemc/files/Config.java

@@ -12,6 +12,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -24,6 +25,7 @@ public class Config {
     public static final FileConfiguration config = YamlConfiguration.loadConfiguration(configFile);
 
     private static final Logger LOGGER = LogManager.getLogger(Config.class.getSimpleName());
+    private static final String SPARK_EXTRA_PROPERTY = "spark.serverconfigs.extra";
 
     public static void load() {
         try {
@@ -65,6 +67,19 @@ public static void save() {
         }
     }
 
+    public static void addSparkEntry() {
+        List<String> additionalConfigs = new ArrayList<>(List.of(
+            configFile.getPath()
+        ));
+
+        String existingConfigs = System.getProperty(SPARK_EXTRA_PROPERTY);
+        if (existingConfigs != null) {
+            additionalConfigs.addAll(Arrays.asList(existingConfigs.split(",")));
+        }
+
+        System.setProperty(SPARK_EXTRA_PROPERTY, String.join(",", additionalConfigs));
+    }
+
     public static boolean getOpActive() {
         return config.getBoolean(OP_COMMAND_ACTIVE.key);
     }

gradle.properties

@@ -1,7 +1,7 @@
 group=de.pascalpex.deepslatemc
 version=1.21.6-R0.1-SNAPSHOT
 mcVersion=1.21.6
-leafRef=029d549bcde13849e61708463e37be1a9ad6bf3c
+leafRef=785c23460bb812ffc32ea3bd06dd7f6befcdd142
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true