43 lines
2.7 KiB
Diff
43 lines
2.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: MrHua269 <mrhua269@gmail.com>
|
|
Date: Wed, 8 Jul 2026 20:49:06 +0800
|
|
Subject: [PATCH] Config system framework
|
|
|
|
|
|
diff --git a/net/minecraft/server/Main.java b/net/minecraft/server/Main.java
|
|
index a4d608d64b7d3477c9144d93547fd3b4f39a1b02..f588a46d019e205be0775f0fd59dea3a57207ea4 100644
|
|
--- a/net/minecraft/server/Main.java
|
|
+++ b/net/minecraft/server/Main.java
|
|
@@ -107,6 +107,7 @@ public class Main {
|
|
JvmProfiler.INSTANCE.start(Environment.SERVER);
|
|
}
|
|
|
|
+ io.nanachiyo0721.shiroha.config.ConfigManager.initConfigs(); // Shiroha - Config system framework - pre load config file
|
|
io.papermc.paper.plugin.PluginInitializerManager.load(options); // Paper
|
|
Bootstrap.bootStrap();
|
|
Bootstrap.validate();
|
|
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
|
|
index 6f13870a1b463049dd37cf1c65d0bdecfc35b5c4..9038249341851ed67ef8392b19d49d7fb70d4137 100644
|
|
--- a/net/minecraft/server/MinecraftServer.java
|
|
+++ b/net/minecraft/server/MinecraftServer.java
|
|
@@ -1169,6 +1169,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
|
ca.spottedleaf.moonrise.common.util.MoonriseCommon.haltExecutors();
|
|
}
|
|
// Paper end - rewrite chunk system
|
|
+ io.nanachiyo0721.shiroha.config.ConfigManager.saveConfigs(false); // Shiroha - Config system framework - save config file
|
|
// Paper start - Improved watchdog support - move final shutdown items here
|
|
Util.shutdownExecutors();
|
|
this.onServerExit();
|
|
diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
|
|
index cd5551c0221ad2a7b5c7d452d8d91ffc9711c3ee..66e02096cf7d386937a19b2f9afcf8b67e385ccc 100644
|
|
--- a/net/minecraft/server/dedicated/DedicatedServer.java
|
|
+++ b/net/minecraft/server/dedicated/DedicatedServer.java
|
|
@@ -238,6 +238,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
|
|
this.paperConfigurations.initializeGlobalConfiguration(this.registryAccess());
|
|
this.paperConfigurations.initializeWorldDefaultsConfiguration(this.registryAccess());
|
|
// Paper end - initialize global and world-defaults configuration
|
|
+ io.nanachiyo0721.shiroha.config.ConfigManager.loadConfigFiles(); // Shiroha - Config system framework - load config file
|
|
this.server.spark.enableEarlyIfRequested(); // Paper - spark
|
|
// Paper start - fix converting txt to json file; convert old users earlier after PlayerList creation but before file load/save
|
|
if (this.convertOldUsers()) {
|