From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Wed, 12 Oct 2022 10:42:15 -0400 Subject: [PATCH] Leaf config Leaf Config v3 including load config, backup old or outdated config, and add config to spark profiler automatically. TODO - Dreeam: Add per world config Update config reload: - Use different state to separate different configs reload (Or sync reload) diff --git a/net/minecraft/server/Main.java b/net/minecraft/server/Main.java index fd3553bdc1c3cdbf6aa3dc00e0a4987f8eaa4fb8..b16f3f515a76ddbbd74d73464396cf094cb30599 100644 --- a/net/minecraft/server/Main.java +++ b/net/minecraft/server/Main.java @@ -109,10 +109,12 @@ public class Main { JvmProfiler.INSTANCE.start(Environment.SERVER); } + org.dreeam.leaf.config.LeafConfig.loadConfig(); // Leaf - Leaf config io.papermc.paper.plugin.PluginInitializerManager.load(optionSet); // Paper Bootstrap.bootStrap(); Bootstrap.validate(); Util.startTimerHackThread(); + org.dreeam.leaf.config.ConfigModules.loadAfterBootstrap(); // Leaf - Leaf config - post load Path path1 = Paths.get("server.properties"); DedicatedServerSettings dedicatedServerSettings = new DedicatedServerSettings(optionSet); // CraftBukkit - CLI argument support dedicatedServerSettings.forceSave(); diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java index 54a9c4b14a51b3480d634703d4936b15330fba53..991833bfa8d6cb6ab3faccc94199b7105523583f 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java @@ -1185,6 +1185,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop