Files
Shiroha/shiroha-server/minecraft-patches/features/0001-Config-system-framework.patch
T

43 lines
2.7 KiB
Diff
Raw Normal View History

2026-07-09 00:03:09 +08:00
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
2026-07-27 20:47:44 +08:00
index e2939cc39a8c103e4c4d7b01d39b5546486e4fbc..8777d662148e41fae9e137a473e47e8b9b5abbfb 100644
2026-07-09 00:03:09 +08:00
--- a/net/minecraft/server/Main.java
+++ b/net/minecraft/server/Main.java
2026-07-27 20:47:44 +08:00
@@ -110,6 +110,7 @@ public class Main {
2026-07-09 00:03:09 +08:00
JvmProfiler.INSTANCE.start(Environment.SERVER);
}
2026-07-14 12:22:17 +08:00
+ io.nanachiyo0721.shiroha.config.ConfigManager.initConfigs(); // Shiroha - Config system framework - pre load config file
2026-07-09 00:03:09 +08:00
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
2026-07-18 19:48:30 +08:00
index 6f13870a1b463049dd37cf1c65d0bdecfc35b5c4..9038249341851ed67ef8392b19d49d7fb70d4137 100644
2026-07-09 00:03:09 +08:00
--- 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
2026-07-14 12:22:17 +08:00
+ io.nanachiyo0721.shiroha.config.ConfigManager.saveConfigs(false); // Shiroha - Config system framework - save config file
2026-07-09 00:03:09 +08:00
// 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
2026-07-14 15:09:17 +08:00
index cd5551c0221ad2a7b5c7d452d8d91ffc9711c3ee..66e02096cf7d386937a19b2f9afcf8b67e385ccc 100644
2026-07-09 00:03:09 +08:00
--- 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
2026-07-14 12:22:17 +08:00
+ io.nanachiyo0721.shiroha.config.ConfigManager.loadConfigFiles(); // Shiroha - Config system framework - load config file
2026-07-09 00:03:09 +08:00
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()) {