Add leaves.yml to spark

LeavesMC · Aug 24, 2023 · ab27c52 · ab27c52
1 parent d71d1a1
commit ab27c52
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/patches/server/0004-Leaves-Server-Config-And-Command.patch b/patches/server/0004-Leaves-Server-Config-And-Command.patch
@@ -31,16 +31,17 @@ index bd87bfcf52da4059b9e345c2d2d7abc725a111a8..c13dccd56b81b88e984e866da199dd8f
              org.spigotmc.WatchdogThread.hasStarted = true; // Paper
              Arrays.fill( recentTps, 20 );
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 09344819e270716d17a59669be2887256a3a6983..27638ebb110f46f7e3d0255e3078ebb586863a30 100644
+index 09344819e270716d17a59669be2887256a3a6983..8c3cc9328f02a66e58c066c54f0bccce807921dc 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -220,6 +220,9 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -220,6 +220,10 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
          io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
          // Paper end
 +		
 +		top.leavesmc.leaves.LeavesConfig.init((java.io.File) options.valueOf("leaves-settings")); // Leaves - Server Config
 +        top.leavesmc.leaves.LeavesConfig.registerCommands(); // Leaves - Server Command
++        System.setProperty("spark.serverconfigs.extra", "leaves.yml"); // Leaves - spark config
 
          com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Leaves - down
 

diff --git a/patches/server/0016-No-chat-sign.patch b/patches/server/0016-No-chat-sign.patch
@@ -110,10 +110,10 @@ index 9d6db4a378036559efab91c8b7dcf2a6b0c2cce6..2c349dc502ce275a8215766933f4855f
      }
  }
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 27638ebb110f46f7e3d0255e3078ebb586863a30..9abc92d8c98c1075ebc74e9dc4290b887913cc29 100644
+index 8c3cc9328f02a66e58c066c54f0bccce807921dc..04ff080242966b035cec4deb79512c915f8509d5 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -643,7 +643,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -644,7 +644,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
      public boolean enforceSecureProfile() {
          DedicatedServerProperties dedicatedserverproperties = this.getProperties();
 

diff --git a/patches/server/0017-Optimize-mob-spawning.patch b/patches/server/0017-Optimize-mob-spawning.patch
@@ -19,10 +19,10 @@ index 3ac048de85febb5ff005c3e7a53326e3fd4623cc..058149dc78a855f72e43e121badacdd6
          AtomicReference<S> atomicreference = new AtomicReference();
          Thread thread = new io.papermc.paper.util.TickThread(() -> { // Paper - rewrite chunk system
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 9abc92d8c98c1075ebc74e9dc4290b887913cc29..06cf3bbf50b941d3504de7198c5ca44ed5af2ff0 100644
+index 04ff080242966b035cec4deb79512c915f8509d5..179d5f1138f296a30e7e1108ce9552e69cde3ccc 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -343,6 +343,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -344,6 +344,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
                  DedicatedServer.LOGGER.info("JMX monitoring enabled");
              }
 

diff --git a/patches/server/0120-Leaves-I18n.patch b/patches/server/0120-Leaves-I18n.patch
@@ -51,13 +51,13 @@ index 571fdf253ebc5cf2a3ec120c53293b37b770836d..800cadbb379cb90d5351c6d73f994713
          ImmutableMap.Builder<String, String> builder = ImmutableMap.builder();
          BiConsumer<String, String> biConsumer = builder::put;
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 06cf3bbf50b941d3504de7198c5ca44ed5af2ff0..3cc988719b413e990c96becef7b15bc904250242 100644
+index 179d5f1138f296a30e7e1108ce9552e69cde3ccc..cf3446afeff3afb58b78c01beca843ae5512fffb 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -223,6 +223,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-
+@@ -224,6 +224,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
  		top.leavesmc.leaves.LeavesConfig.init((java.io.File) options.valueOf("leaves-settings")); // Leaves - Server Config
          top.leavesmc.leaves.LeavesConfig.registerCommands(); // Leaves - Server Command
+         System.setProperty("spark.serverconfigs.extra", "leaves.yml"); // Leaves - spark config
 +        net.minecraft.locale.Language.loadI18N(top.leavesmc.leaves.LeavesConfig.serverLang); // Leaves - i18n
 
          com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Leaves - down

diff --git a/patches/server/0122-Delete-Timings.patch b/patches/server/0122-Delete-Timings.patch
@@ -1126,7 +1126,7 @@ index 4a610b712acfe0b1b4dcf4988bc22c6a71616050..562fb1601db7e04899d4313fe4a32f02
                  i = this.context.runTopCommand(function, source);
              } finally {
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 3cc988719b413e990c96becef7b15bc904250242..406e77b56ee433ce4123e450da4bc9647c9a6102 100644
+index cf3446afeff3afb58b78c01beca843ae5512fffb..1701ff0aa122680626cecedce2cdc804ddad06f6 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -58,7 +58,6 @@ import org.apache.logging.log4j.Level;
@@ -1137,23 +1137,23 @@ index 3cc988719b413e990c96becef7b15bc904250242..406e77b56ee433ce4123e450da4bc964
  import org.bukkit.event.server.ServerCommandEvent;
  import org.bukkit.craftbukkit.util.Waitable;
  import org.bukkit.event.server.RemoteServerCommandEvent;
-@@ -495,7 +494,6 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -496,7 +495,6 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
      }
 
      public void handleConsoleInputs() {
 -        MinecraftTimings.serverCommandTimer.startTiming(); // Spigot
          // Paper start - use proper queue
          ConsoleInput servercommand;
          while ((servercommand = this.serverCommandQueue.poll()) != null) {
-@@ -512,7 +510,6 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -513,7 +511,6 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
              // CraftBukkit end
          }
 
 -        MinecraftTimings.serverCommandTimer.stopTiming(); // Spigot
      }
 
      @Override
-@@ -769,22 +766,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -770,22 +767,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
              if (event.isCancelled()) {
                  return;
              }