Merge pull request #3330 from ElFrod0/config-server-properties-path

Configurable server.properties path

Author: benwoo1110

src/main/java/org/mvplugins/multiverse/core/config/CoreConfig.java

@@ -623,6 +623,16 @@ public String getBukkitYmlPath() {
         return configHandle.get(configNodes.bukkitYmlPath);
     }
 
+    @ApiStatus.AvailableSince("5.3")
+    public Try<Void> setServerPropertiesPath(String serverPropertiesPath) {
+        return configHandle.set(configNodes.serverPropertiesPath, serverPropertiesPath);
+    }
+
+    @ApiStatus.AvailableSince("5.3")
+    public String getServerPropertiesPath() {
+        return configHandle.get(configNodes.serverPropertiesPath);
+    }
+
     /**
      * {@inheritDoc}
      */

src/main/java/org/mvplugins/multiverse/core/config/CoreConfigNodes.java

@@ -512,6 +512,14 @@ private <N extends Node> N node(N node) {
             .name("bukkit-yml-path")
             .build());
 
+    final ConfigNode<String> serverPropertiesPath = node(ConfigNode.builder("misc.server-properties-path", String.class)
+            .comment("")
+            .comment("Change this if you use a custom path for the server.properties file with `--config` startup flag.")
+            .comment("Note: this config option needs a server restart to take effect.")
+            .defaultValue("server.properties")
+            .name("server-properties-path")
+            .build());
+
     final ConfigNode<Integer> globalDebug = node(ConfigNode.builder("misc.global-debug", Integer.class)
             .comment("")
             .comment("This is our debug flag to help identify issues with Multiverse.")

src/main/java/org/mvplugins/multiverse/core/utils/FileUtils.java

@@ -77,7 +77,7 @@ public File getServerFolder() {
      */
     public @Nullable File getServerProperties() {
         if (this.serverProperties == null) {
-            this.serverProperties = findFileFromServerDirectory("server.properties");
+            this.serverProperties = findFileFromServerDirectory(config.getServerPropertiesPath());
             Logging.finer("server.properties: %s", this.serverProperties);
         }
         return this.serverProperties;

src/test/resources/configs/fresh_config.yml

@@ -54,6 +54,7 @@ event-priority:
 
 misc:
   bukkit-yml-path: bukkit.yml
+  server-properties-path: server.properties
   global-debug: 0
   debug-permissions: false
   silent-start: false