diff --git a/patches/server/0009-Setup-basic-configuration-sections.patch b/patches/server/0009-Setup-basic-configuration-sections.patch index c2af4c69b..9bd702206 100644 --- a/patches/server/0009-Setup-basic-configuration-sections.patch +++ b/patches/server/0009-Setup-basic-configuration-sections.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Setup basic configuration sections diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -index b638690d5cd2360444e6c525f97f634d8e1dc60e..35d5bd2f7dba1aa74547b6ae994bc84a56911bf2 100644 +index b638690d5cd2360444e6c525f97f634d8e1dc60e..e89534b6e2b91483d7eddfcb3441e9addf9bccc7 100644 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java @@ -6,6 +6,7 @@ import it.unimi.dsi.fastutil.objects.Reference2ObjectMap; @@ -16,10 +16,16 @@ index b638690d5cd2360444e6c525f97f634d8e1dc60e..35d5bd2f7dba1aa74547b6ae994bc84a import org.spongepowered.configurate.objectmapping.meta.Setting; import java.util.List; -@@ -27,4 +28,55 @@ public class GlobalConfiguration extends ConfigurationPart { +@@ -27,4 +28,61 @@ public class GlobalConfiguration extends ConfigurationPart { @Setting(Configuration.VERSION_FIELD) int version = VERSION; ++ public Messages messages; ++ public class Messages extends ConfigurationPart { ++ ++ ++ } ++ + public Command command; + public class Command extends ConfigurationPart { + diff --git a/patches/server/0015-Tweak-console-logging.patch b/patches/server/0015-Tweak-console-logging.patch index 2d7ba8c30..27d6e1bdc 100644 --- a/patches/server/0015-Tweak-console-logging.patch +++ b/patches/server/0015-Tweak-console-logging.patch @@ -71,10 +71,10 @@ index 5b1705794a8c3914cb11fdd35f75c8e0c128ecd0..459eea7dae68afdf7e1443f29f6f8d0c } diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -index 35d5bd2f7dba1aa74547b6ae994bc84a56911bf2..e153370e617e63a8e497036c93ea55dfe851bc6e 100644 +index e89534b6e2b91483d7eddfcb3441e9addf9bccc7..3a9fa2ac6dc5eaa153deb06a005be51c59786bbe 100644 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -@@ -79,4 +79,14 @@ public class GlobalConfiguration extends ConfigurationPart { +@@ -85,4 +85,14 @@ public class GlobalConfiguration extends ConfigurationPart { } diff --git a/patches/server/0018-Add-option-to-change-nether-portal-size.patch b/patches/server/0018-Add-option-to-change-nether-portal-size.patch index 2dc40d7cf..72b954a9b 100644 --- a/patches/server/0018-Add-option-to-change-nether-portal-size.patch +++ b/patches/server/0018-Add-option-to-change-nether-portal-size.patch @@ -36,10 +36,10 @@ index acdff7b4a00d563739fd301c3633a266875296fa..1266aaf4bfcf53aa16d7b9bd697a0c48 // CraftBukkit start - return boolean, add entity diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -index e153370e617e63a8e497036c93ea55dfe851bc6e..11d386d3e134b1994302c4e026b6a11c46336522 100644 +index 3a9fa2ac6dc5eaa153deb06a005be51c59786bbe..f99a281244f7b736bd979cfc0bcd0787d9da9a42 100644 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -@@ -70,6 +70,26 @@ public class GlobalConfiguration extends ConfigurationPart { +@@ -76,6 +76,26 @@ public class GlobalConfiguration extends ConfigurationPart { public Structure structure; public class Structure extends ConfigurationPart { diff --git a/patches/server/0021-Add-option-to-disable-moved-to-quickly-check-for-spe.patch b/patches/server/0021-Add-option-to-disable-moved-to-quickly-check-for-spe.patch index 6a253d2ce..6689672cf 100644 --- a/patches/server/0021-Add-option-to-disable-moved-to-quickly-check-for-spe.patch +++ b/patches/server/0021-Add-option-to-disable-moved-to-quickly-check-for-spe.patch @@ -24,10 +24,10 @@ index c783c17d45beda8297171d0834350197808a7335..611de28d27d75b73e33a552c8a23d6c0 return false; } else if (this.player.isChangingDimension()) { diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -index 11d386d3e134b1994302c4e026b6a11c46336522..93d746b0e7f263b36a66864834445cb41e5e2cee 100644 +index f99a281244f7b736bd979cfc0bcd0787d9da9a42..6d313edc60082a5f2d30ef8ad9fbd57772f361fe 100644 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -@@ -37,6 +37,7 @@ public class GlobalConfiguration extends ConfigurationPart { +@@ -43,6 +43,7 @@ public class GlobalConfiguration extends ConfigurationPart { public Player player; public class Player extends ConfigurationPart { diff --git a/patches/server/0022-Configurable-cave-lava-sea-level.patch b/patches/server/0022-Configurable-cave-lava-sea-level.patch index 25d7c37e5..f64e21a30 100644 --- a/patches/server/0022-Configurable-cave-lava-sea-level.patch +++ b/patches/server/0022-Configurable-cave-lava-sea-level.patch @@ -33,10 +33,10 @@ index 3f39d6c786d9dfdd9ad591e08ff05fcbb41a1df6..0346fd4ab7095d66c0eef5a440afbc7a @Override diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -index 93d746b0e7f263b36a66864834445cb41e5e2cee..0b59a3a36c86948877cb8cb875dc114e9f9d284a 100644 +index 6d313edc60082a5f2d30ef8ad9fbd57772f361fe..5450d2a784511122a8236d30485f6b1f798822f3 100644 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -@@ -45,6 +45,24 @@ public class GlobalConfiguration extends ConfigurationPart { +@@ -51,6 +51,24 @@ public class GlobalConfiguration extends ConfigurationPart { public WorldGeneration worldgen; public class WorldGeneration extends ConfigurationPart { diff --git a/patches/server/0032-Implement-FreedomChat.patch b/patches/server/0032-Implement-FreedomChat.patch index ab4934589..cb5931378 100644 --- a/patches/server/0032-Implement-FreedomChat.patch +++ b/patches/server/0032-Implement-FreedomChat.patch @@ -52,10 +52,10 @@ index 459eea7dae68afdf7e1443f29f6f8d0c68668b74..aead28160c7a5067340ec80a833eafca player.loadGameTypes((CompoundTag) optional.orElse(null)); // CraftBukkit - decompile error ServerGamePacketListenerImpl playerconnection = new ServerGamePacketListenerImpl(this.server, connection, player, clientData); diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -index 0b59a3a36c86948877cb8cb875dc114e9f9d284a..6e14f6a03c7bcd820f3d787178a62844ad022332 100644 +index 5450d2a784511122a8236d30485f6b1f798822f3..a0b1239e302f0366743949a895a0539348817077 100644 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -@@ -39,6 +39,15 @@ public class GlobalConfiguration extends ConfigurationPart { +@@ -45,6 +45,15 @@ public class GlobalConfiguration extends ConfigurationPart { public boolean checkSpectatorMovedToQuickly = !OPTIMIZE; diff --git a/patches/server/0033-Reset-dirty-flag-when-loading-maps-from-the-disk.patch b/patches/server/0033-Reset-dirty-flag-when-loading-maps-from-the-disk.patch index 64b7dba57..53a4de3c1 100644 --- a/patches/server/0033-Reset-dirty-flag-when-loading-maps-from-the-disk.patch +++ b/patches/server/0033-Reset-dirty-flag-when-loading-maps-from-the-disk.patch @@ -19,10 +19,10 @@ index 26da9e7c25ef6a89482838010d8ed6bcf8c87511..71aa3b9c5604f832e764e0d7a93da467 } diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -index 6e14f6a03c7bcd820f3d787178a62844ad022332..193e565b6d62caf278223db033351d03ff417637 100644 +index a0b1239e302f0366743949a895a0539348817077..14ba63f5ef6ad5d96972b18e1174a8a94491fa57 100644 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -@@ -124,6 +124,7 @@ public class GlobalConfiguration extends ConfigurationPart { +@@ -130,6 +130,7 @@ public class GlobalConfiguration extends ConfigurationPart { public Miscellaneous misc; public class Miscellaneous extends ConfigurationPart { diff --git a/patches/server/0037-Load-player-data-asynchronously.patch b/patches/server/0037-Load-player-data-asynchronously.patch index f1f83242e..20f7d5025 100644 --- a/patches/server/0037-Load-player-data-asynchronously.patch +++ b/patches/server/0037-Load-player-data-asynchronously.patch @@ -56,10 +56,10 @@ index aead28160c7a5067340ec80a833eafcab1817d67..c18868796957c0756aca3b5a15fd0d0c // CraftBukkit start - Better rename detection if (optional.isPresent()) { diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -index 193e565b6d62caf278223db033351d03ff417637..7f30fa1928e1a7e59ee5acfdfd2334f810c30243 100644 +index 14ba63f5ef6ad5d96972b18e1174a8a94491fa57..c2f3facf65aa2682306c64c3466357461a76f267 100644 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -@@ -38,6 +38,7 @@ public class GlobalConfiguration extends ConfigurationPart { +@@ -44,6 +44,7 @@ public class GlobalConfiguration extends ConfigurationPart { public class Player extends ConfigurationPart { public boolean checkSpectatorMovedToQuickly = !OPTIMIZE; diff --git a/patches/server/0039-Optimize-advancement-criteria-triggering.patch b/patches/server/0039-Optimize-advancement-criteria-triggering.patch index e1a40555f..ac4296676 100644 --- a/patches/server/0039-Optimize-advancement-criteria-triggering.patch +++ b/patches/server/0039-Optimize-advancement-criteria-triggering.patch @@ -51,10 +51,10 @@ index ebbad97920df3d1645637e646a98e16cb04d361e..a149c949a042e1d1e504d9f5ce0bfa6d int j = 0; int k = 0; diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -index 7f30fa1928e1a7e59ee5acfdfd2334f810c30243..ba2c7b679f68d49add77731383bf68292fe9614a 100644 +index c2f3facf65aa2682306c64c3466357461a76f267..8914159c17b3c8b0114e88c5317df5f17b05e5d6 100644 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -@@ -139,4 +139,16 @@ public class GlobalConfiguration extends ConfigurationPart { +@@ -145,4 +145,16 @@ public class GlobalConfiguration extends ConfigurationPart { } diff --git a/patches/server/0044-Process-pathfinding-asynchronously.patch b/patches/server/0044-Process-pathfinding-asynchronously.patch index 2353b3d85..37341f525 100644 --- a/patches/server/0044-Process-pathfinding-asynchronously.patch +++ b/patches/server/0044-Process-pathfinding-asynchronously.patch @@ -1301,10 +1301,10 @@ index 1c83926923f50fb4da1a83dc91614c20a831555f..aec2d0f9a957be65d031957dbff874d8 Command.broadcastCommandMessage(sender, text("Successfully reloaded Plazma configuration files.", NamedTextColor.GREEN)); diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -index ba2c7b679f68d49add77731383bf68292fe9614a..81f7ac9753058aa72dea5704fc9859ba3b909fb1 100644 +index 8914159c17b3c8b0114e88c5317df5f17b05e5d6..92de32ee00bc9c4e8750773bca95a9cf5fbae067 100644 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -@@ -80,6 +80,26 @@ public class GlobalConfiguration extends ConfigurationPart { +@@ -86,6 +86,26 @@ public class GlobalConfiguration extends ConfigurationPart { public class Entity extends ConfigurationPart { diff --git a/patches/server/0045-Implement-alternative-noise-chunk-generator.patch b/patches/server/0045-Implement-alternative-noise-chunk-generator.patch index ffa129284..2bd16a215 100644 --- a/patches/server/0045-Implement-alternative-noise-chunk-generator.patch +++ b/patches/server/0045-Implement-alternative-noise-chunk-generator.patch @@ -218,10 +218,10 @@ index 0e6dfe2635ea5f5e410049b05f94f5083b2f18a4..584311a00c5037a6d5bc05b1261969aa return null; } diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -index 81f7ac9753058aa72dea5704fc9859ba3b909fb1..dc632fe50e777c019705796602debc3a7f33152d 100644 +index 92de32ee00bc9c4e8750773bca95a9cf5fbae067..fbcbbba15e8f7f8ea812a75d807908925305cb29 100644 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -@@ -55,6 +55,8 @@ public class GlobalConfiguration extends ConfigurationPart { +@@ -61,6 +61,8 @@ public class GlobalConfiguration extends ConfigurationPart { public WorldGeneration worldgen; public class WorldGeneration extends ConfigurationPart { @@ -230,7 +230,7 @@ index 81f7ac9753058aa72dea5704fc9859ba3b909fb1..dc632fe50e777c019705796602debc3a public LavaSea lavaSea; public class LavaSea extends ConfigurationPart { -@@ -74,6 +76,11 @@ public class GlobalConfiguration extends ConfigurationPart { +@@ -80,6 +82,11 @@ public class GlobalConfiguration extends ConfigurationPart { } diff --git a/patches/server/0056-SparklyPaper-Optimize-season-check.patch b/patches/server/0056-SparklyPaper-Optimize-season-check.patch index 54c54fc0f..3d7a5f4e6 100644 --- a/patches/server/0056-SparklyPaper-Optimize-season-check.patch +++ b/patches/server/0056-SparklyPaper-Optimize-season-check.patch @@ -123,10 +123,10 @@ index 0000000000000000000000000000000000000000..530bac5a415c8597ae76ec603c1d8158 + +} diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -index dc632fe50e777c019705796602debc3a7f33152d..914f0d59801250d4e738a8595c747fd1e766d13f 100644 +index fbcbbba15e8f7f8ea812a75d807908925305cb29..768cb135081c233a820566015ed58351e417c45c 100644 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -@@ -153,6 +153,17 @@ public class GlobalConfiguration extends ConfigurationPart { +@@ -159,6 +159,17 @@ public class GlobalConfiguration extends ConfigurationPart { public class Miscellaneous extends ConfigurationPart { public boolean resetDirtyWhenLoadingMapsFromDisk = false; diff --git a/patches/server/0058-Ticking-Controller.patch b/patches/server/0058-Ticking-Controller.patch index e47a3d24c..8826e2d35 100644 --- a/patches/server/0058-Ticking-Controller.patch +++ b/patches/server/0058-Ticking-Controller.patch @@ -226,10 +226,10 @@ index 028aea6640356ba80f5d682e3cc03b7f82f5b9c7..d788849dc5a568d455cd83ca5b6e1b4b @Override diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -index 914f0d59801250d4e738a8595c747fd1e766d13f..7ea1b7e41557b7960b65b2e6d2dcb6fd2f9a24af 100644 +index 768cb135081c233a820566015ed58351e417c45c..898f9e6ec6f306a15639ee0d03bcfe7bf55e2c6c 100644 --- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java +++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -@@ -189,4 +189,39 @@ public class GlobalConfiguration extends ConfigurationPart { +@@ -195,4 +195,39 @@ public class GlobalConfiguration extends ConfigurationPart { } diff --git a/patches/server/0061-Configurable-player-list-file-path.patch b/patches/server/0061-Add-options-to-modify-configurations-path.patch similarity index 53% rename from patches/server/0061-Configurable-player-list-file-path.patch rename to patches/server/0061-Add-options-to-modify-configurations-path.patch index 190ef8cd0..d20a1f956 100644 --- a/patches/server/0061-Configurable-player-list-file-path.patch +++ b/patches/server/0061-Add-options-to-modify-configurations-path.patch @@ -1,9 +1,79 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: AlphaKR93 Date: Wed, 25 Dec 2024 13:24:51 +0900 -Subject: [PATCH] Configurable player list file path +Subject: [PATCH] Add options to modify configurations path +diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java +index 21a3761f075ace896c981936b2810fccb0b5d610..d99adf4a0b430b8a1ae41d3f4f04ad0c7a6e7eaa 100644 +--- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java ++++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java +@@ -135,7 +135,7 @@ public class PaperVersionFetcher implements VersionFetcher { + } + + private @Nullable Component getHistory() { +- final VersionHistoryManager.@Nullable VersionData data = VersionHistoryManager.INSTANCE.getVersionData(); ++ final VersionHistoryManager.@Nullable VersionData data = VersionHistoryManager.getInstance().getVersionData(); // Plazma - Add options to modify the configuration files + if (data == null) { + return null; + } +diff --git a/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java +index 660b2ec6b63a4ceffee44ab11f54dfa7c0d0996f..aa936d21bd458deef5672ddd782897c41daa765e 100644 +--- a/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java ++++ b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java +@@ -19,8 +19,24 @@ import org.bukkit.Bukkit; + import javax.annotation.Nonnull; + import javax.annotation.Nullable; + +-public enum VersionHistoryManager { +- INSTANCE; ++// Plazma start - Add options to modify the configuration files ++public final class VersionHistoryManager { ++ private static VersionHistoryManager INSTANCE; ++ ++ public static VersionHistoryManager getInstance() { ++ if (INSTANCE == null) { ++ throw new IllegalStateException("VersionHistoryManager has not been initialized yet"); ++ } ++ return INSTANCE; ++ } ++ ++ public static void initialize(final joptsimple.OptionSet options) { ++ if (INSTANCE != null) { ++ throw new IllegalStateException("VersionHistoryManager has already been initialized"); ++ } ++ INSTANCE = new VersionHistoryManager((java.io.File) options.valueOf("version-history")); ++ } ++ // Plazma end - Add options to modify the configuration files + + private final Gson gson = new Gson(); + +@@ -28,8 +44,10 @@ public enum VersionHistoryManager { + + private VersionData currentData = null; + +- VersionHistoryManager() { +- final Path path = Paths.get("version_history.json"); ++ // Plazma start - Add options to modify the configuration files ++ private VersionHistoryManager(final @Nonnull java.io.File file) { ++ final Path path = file.toPath(); ++ // Plazma end - Add options to modify the configuration files + + if (Files.exists(path)) { + // Basic file santiy checks +diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +index 3e211e6ea16c8110e662d6201e8325ecd3d6a93b..011cdc8dbef3e823bdccf1a1c7cf945cf0cf7005 100644 +--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java ++++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +@@ -256,7 +256,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface + } + org.purpurmc.purpur.PurpurConfig.registerCommands(); + // Purpur end - Purpur config files +- com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now ++ com.destroystokyo.paper.VersionHistoryManager.initialize(this.options); // Paper - load version history now // Plazma - Add options to modify the configuration files + gg.pufferfish.pufferfish.PufferfishConfig.pufferfishFile = (java.io.File) options.valueOf("pufferfish-settings"); // Purpur - Fix pufferfish issues + gg.pufferfish.pufferfish.PufferfishConfig.load(); // Pufferfish + gg.pufferfish.pufferfish.PufferfishCommand.init(); // Pufferfish diff --git a/src/main/java/net/minecraft/server/players/OldUsersConverter.java b/src/main/java/net/minecraft/server/players/OldUsersConverter.java index 1f2958d21c279ecb377b7c90ba643ea83e217eca..6a411f609c48b28115b947494062f9f7bf5b2d93 100644 --- a/src/main/java/net/minecraft/server/players/OldUsersConverter.java @@ -83,10 +153,10 @@ index d5d09bf63f4b7fba73188f75d5fe9599b8da2844..8ab6df63d9a22ac76b2ba14bc8fef318 this.registries = registryManager; this.maxPlayers = maxPlayers; diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index a75f3328ba32466b6ceeddb0069c856524f19c0a..10308192df338ebb3db8d2e1ebade4786ee4ec28 100644 +index a75f3328ba32466b6ceeddb0069c856524f19c0a..913213c77fa2cf8038768a34b38bb59d698e714b 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -205,6 +205,32 @@ public class Main { +@@ -205,6 +205,44 @@ public class Main { .defaultsTo(new File(org.plazmamc.plazma.configurations.PlazmaConfigurations.CONFIG_DIR)) .describedAs("Configuration Directory"); // Plazma end - Configurable Plazma @@ -115,7 +185,32 @@ index a75f3328ba32466b6ceeddb0069c856524f19c0a..10308192df338ebb3db8d2e1ebade478 + .ofType(File.class) + .defaultsTo(new File("whitelist.json")) + .describedAs("JSON file"); ++ ++ acceptsAll(asList("version-history"), "File for version history") ++ .withRequiredArg() ++ .ofType(File.class) ++ .defaultsTo(new File("version_history.json")) ++ .describedAs("JSON file"); ++ ++ acceptsAll(asList("help"), "File for help command") ++ .withRequiredArg() ++ .ofType(File.class) ++ .defaultsTo(new File("help.yml")) ++ .describedAs("Yaml file"); + // Plazma end - Configurable player data storage } }; +diff --git a/src/main/java/org/bukkit/craftbukkit/help/HelpYamlReader.java b/src/main/java/org/bukkit/craftbukkit/help/HelpYamlReader.java +index 5923d3c17756c489fcb392044c0679fe52e2d58f..a433d691831c620112a1c824f8f26cb50cfa8dbd 100644 +--- a/src/main/java/org/bukkit/craftbukkit/help/HelpYamlReader.java ++++ b/src/main/java/org/bukkit/craftbukkit/help/HelpYamlReader.java +@@ -25,7 +25,7 @@ public class HelpYamlReader { + public HelpYamlReader(Server server) { + this.server = server; + +- File helpYamlFile = new File("help.yml"); ++ File helpYamlFile = (File) ((org.bukkit.craftbukkit.CraftServer) server).getHandle().getServer().options.valueOf("help"); // Plazma - Add options to modify the configuration files + YamlConfiguration defaultConfig = YamlConfiguration.loadConfiguration(new InputStreamReader(this.getClass().getClassLoader().getResourceAsStream("configurations/help.yml"), Charsets.UTF_8)); + + try { diff --git a/patches/server/0064-Add-heal-command.patch b/patches/server/0063-Add-heal-command.patch similarity index 100% rename from patches/server/0064-Add-heal-command.patch rename to patches/server/0063-Add-heal-command.patch diff --git a/patches/server/0063-fixup-Setup-basic-configuration-sections.patch b/patches/server/0063-fixup-Setup-basic-configuration-sections.patch deleted file mode 100644 index 2250e9638..000000000 --- a/patches/server/0063-fixup-Setup-basic-configuration-sections.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: AlphaKR93 -Date: Wed, 25 Dec 2024 18:40:23 +0900 -Subject: [PATCH] fixup! Setup basic configuration sections - - -diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -index 7ea1b7e41557b7960b65b2e6d2dcb6fd2f9a24af..898f9e6ec6f306a15639ee0d03bcfe7bf55e2c6c 100644 ---- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -+++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java -@@ -28,6 +28,12 @@ public class GlobalConfiguration extends ConfigurationPart { - @Setting(Configuration.VERSION_FIELD) - int version = VERSION; - -+ public Messages messages; -+ public class Messages extends ConfigurationPart { -+ -+ -+ } -+ - public Command command; - public class Command extends ConfigurationPart { - diff --git a/patches/server/0065-Add-missing-argument-place-for-compass-command.patch b/patches/server/0064-Add-missing-argument-place-for-compass-command.patch similarity index 100% rename from patches/server/0065-Add-missing-argument-place-for-compass-command.patch rename to patches/server/0064-Add-missing-argument-place-for-compass-command.patch