Repo-Mirror/PlazmaBukkitMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity
Files
637b0ef8cb827ae26b3906c7582d998820532091
PlazmaBukkitMC/patches/server/0060-Add-options-to-modify-configurations-path.patch
AlphaKR93 0c58a0b04a Fix build
2024-12-26 01:22:49 +09:00

264 lines
15 KiB
Diff
Raw Blame History

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <dev@alpha93.kr>
Date: Wed, 25 Dec 2024 13:24:51 +0900
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/gg/pufferfish/pufferfish/PufferfishVersionFetcher.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishVersionFetcher.java
index 06323dcc745aed16123980fc559d7b65c42f1e1c..ee37957264b7830c29a72f76ef4d7729bc66040c 100644
--- a/src/main/java/gg/pufferfish/pufferfish/PufferfishVersionFetcher.java
+++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishVersionFetcher.java
@@ -117,7 +117,7 @@ public class PufferfishVersionFetcher implements VersionFetcher {
}
private @Nullable Component getHistory() {
- final VersionHistoryManager.VersionData data = VersionHistoryManager.INSTANCE.getVersionData();
+ final VersionHistoryManager.VersionData data = VersionHistoryManager.getInstance().getVersionData(); // Plazma - Add options to modify the configuration files
if (data == null) {
return null;
}
@@ -129,4 +129,4 @@ public class PufferfishVersionFetcher implements VersionFetcher {
return Component.text("Previous version: " + oldVersion, NamedTextColor.GRAY, TextDecoration.ITALIC);
}
-}
\ No newline at end of file
+}
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
+++ b/src/main/java/net/minecraft/server/players/OldUsersConverter.java
@@ -82,7 +82,7 @@ public class OldUsersConverter {
}
public static boolean convertUserBanlist(final MinecraftServer server) {
- final UserBanList gameprofilebanlist = new UserBanList(PlayerList.USERBANLIST_FILE);
+ final UserBanList gameprofilebanlist = new UserBanList((File) server.options.valueOf("banned-players")); // Plazma - Configurable player list file path
if (OldUsersConverter.OLD_USERBANLIST.exists() && OldUsersConverter.OLD_USERBANLIST.isFile()) {
if (gameprofilebanlist.getFile().exists()) {
@@ -140,7 +140,7 @@ public class OldUsersConverter {
}
public static boolean convertIpBanlist(MinecraftServer server) {
- IpBanList ipbanlist = new IpBanList(PlayerList.IPBANLIST_FILE);
+ IpBanList ipbanlist = new IpBanList((File) server.options.valueOf("banned-ips")); // Plazma - Configurable player list file path
if (OldUsersConverter.OLD_IPBANLIST.exists() && OldUsersConverter.OLD_IPBANLIST.isFile()) {
if (ipbanlist.getFile().exists()) {
@@ -181,7 +181,7 @@ public class OldUsersConverter {
}
public static boolean convertOpsList(final MinecraftServer server) {
- final ServerOpList oplist = new ServerOpList(PlayerList.OPLIST_FILE);
+ final ServerOpList oplist = new ServerOpList((File) server.options.valueOf("ops")); // Plazma - Configurable player list file path
if (OldUsersConverter.OLD_OPLIST.exists() && OldUsersConverter.OLD_OPLIST.isFile()) {
if (oplist.getFile().exists()) {
@@ -225,7 +225,7 @@ public class OldUsersConverter {
}
public static boolean convertWhiteList(final MinecraftServer server) {
- final UserWhiteList whitelist = new UserWhiteList(PlayerList.WHITELIST_FILE);
+ final UserWhiteList whitelist = new UserWhiteList((File) server.options.valueOf("whitelist")); // Plazma - Configurable player list file path
if (OldUsersConverter.OLD_WHITELIST.exists() && OldUsersConverter.OLD_WHITELIST.isFile()) {
if (whitelist.getFile().exists()) {
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index d5d09bf63f4b7fba73188f75d5fe9599b8da2844..8ab6df63d9a22ac76b2ba14bc8fef318e65484c8 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -126,10 +126,12 @@ import org.bukkit.event.player.PlayerSpawnChangeEvent;
public abstract class PlayerList {
+ /* // Plazma - Configurable player list file path
public static final File USERBANLIST_FILE = new File("banned-players.json");
public static final File IPBANLIST_FILE = new File("banned-ips.json");
public static final File OPLIST_FILE = new File("ops.json");
public static final File WHITELIST_FILE = new File("whitelist.json");
+ */ // Plazma - Configurable player list file path
public static final Component CHAT_FILTERED_FULL = Component.translatable("chat.filtered_full");
public static final Component DUPLICATE_LOGIN_DISCONNECT_MESSAGE = Component.translatable("multiplayer.disconnect.duplicate_login");
private static final Logger LOGGER = LogUtils.getLogger();
@@ -167,14 +169,12 @@ public abstract class PlayerList {
server.console = new com.destroystokyo.paper.console.TerminalConsoleCommandSender(); // Paper
// CraftBukkit end
- this.bans = new UserBanList(PlayerList.USERBANLIST_FILE);
- this.ipBans = new IpBanList(PlayerList.IPBANLIST_FILE);
- this.ops = new ServerOpList(PlayerList.OPLIST_FILE);
- this.whitelist = new UserWhiteList(PlayerList.WHITELIST_FILE);
- // CraftBukkit start
- // this.stats = Maps.newHashMap();
- // this.advancements = Maps.newHashMap();
- // CraftBukkit end
+ // Plazma start - Configurable player list file path
+ this.bans = new UserBanList((File) server.options.valueOf("banned-players"));
+ this.ipBans = new IpBanList((File) server.options.valueOf("banned-ips"));
+ this.ops = new ServerOpList((File) server.options.valueOf("ops"));
+ this.whitelist = new UserWhiteList((File) server.options.valueOf("whitelist"));
+ // Plazma end - Configurable player list file path
this.server = server;
this.registries = registryManager;
this.maxPlayers = maxPlayers;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 15527e902484496a6804c879d1de589bed3f8713..b2f924d0236683dc0a994350efe9a9db54b2ab98 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -276,12 +276,12 @@ public final class CraftServer implements Server {
private final ServicesManager servicesManager = new SimpleServicesManager();
private final CraftScheduler scheduler = new CraftScheduler();
private final CraftCommandMap commandMap; // Paper - Move down
- private final SimpleHelpMap helpMap = new SimpleHelpMap(this);
+ private final SimpleHelpMap helpMap;
private final StandardMessenger messenger = new StandardMessenger();
private final SimplePluginManager pluginManager; // Paper - Move down
public final io.papermc.paper.plugin.manager.PaperPluginManagerImpl paperPluginManager; // Paper
private final StructureManager structureManager;
- protected final DedicatedServer console;
+ public final DedicatedServer console; // Plazma - AT (protected -> public)
protected final DedicatedPlayerList playerList;
private final Map<String, World> worlds = new LinkedHashMap<String, World>();
// private final Map<Class<?>, Registry<?>> registries = new HashMap<>(); // Paper - replace with RegistryAccess
@@ -421,6 +421,7 @@ public final class CraftServer implements Server {
Bukkit.setServer(this);
// Paper start
+ this.helpMap = new SimpleHelpMap(this); // Plazma - Add options to modify the configuration files
this.commandMap = new CraftCommandMap(this);
this.pluginManager = new SimplePluginManager(this, commandMap);
this.paperPluginManager = new io.papermc.paper.plugin.manager.PaperPluginManagerImpl(this, this.commandMap, pluginManager);
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
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,44 @@ public class Main {
.defaultsTo(new File(org.plazmamc.plazma.configurations.PlazmaConfigurations.CONFIG_DIR))
.describedAs("Configuration Directory");
// Plazma end - Configurable Plazma
+
+ // Plazma start - Configurable player data storage
+ acceptsAll(asList("banned-ips"), "File for banned IPs")
+ .withRequiredArg()
+ .ofType(File.class)
+ .defaultsTo(new File("banned-ips.json"))
+ .describedAs("JSON file");
+
+ acceptsAll(asList("banned-players"), "File for banned players")
+ .withRequiredArg()
+ .ofType(File.class)
+ .defaultsTo(new File("banned-players.json"))
+ .describedAs("JSON file");
+
+ acceptsAll(asList("ops"), "File for ops")
+ .withRequiredArg()
+ .ofType(File.class)
+ .defaultsTo(new File("ops.json"))
+ .describedAs("JSON file");
+
+ acceptsAll(asList("whitelist"), "File for whitelist")
+ .withRequiredArg()
+ .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..3ec5cf874dfd9d2e016daa9f7c7aee2646e67861 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).console.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 {
Reference in New Issue View Git Blame Copy Permalink