config changes and commandmeta

Author: bierdosenhalter

.idea/workspace.xml

@@ -11,11 +11,13 @@
 import java.util.Map;
 
 public class Config {
+    private final Main main;
     private final Path configPath;
     private final Logger logger;
     private Map<String, Object> configValues;
 
-    public Config(Path dataDirectory, Logger logger) {
+    public Config(Main main, Path dataDirectory, Logger logger) {
+        this.main = main;
         this.configPath = dataDirectory.resolve("config.yml");
         this.logger = logger;
         loadConfig();
@@ -37,16 +39,20 @@ private void loadConfig() {
 
     private void createDefaultConfig() {
         try {
+            Files.createDirectories(configPath.getParent());
+
             Files.createFile(configPath);
+
             try (BufferedWriter writer = Files.newBufferedWriter(configPath)) {
-                writer.write("versionName: ZeroPaper 1.12.2+\n");
-                writer.write("versionMinProtocol: 340\n");
+                writer.write("# Created on " + main.getServer().getVersion().getName() + " " + main.getServer().getVersion().getVersion() + "\n");
+                writer.write("versionName: \"LimeWire 5.5.16\"\n");
+                writer.write("versionMinProtocol: 340 # 1.12.2\n");
                 writer.write("setHoverInfo: true\n");
                 writer.write("messageOfTheDayOverride: false\n");
-                writer.write("messageOfTheDay: ''\n");
-                writer.write("bStats: false\n");
+                writer.write("messageOfTheDay: \"A Minecraft Server\"\n");
+                writer.write("bStats: true\n");
                 writer.write("useMainServer: false\n");
-                writer.write("mainServer: 'main'\n");
+                writer.write("mainServer: \"main\"\n");
             }
             logger.info("Default config created.");
         } catch (IOException e) {
@@ -65,4 +71,16 @@ public boolean getBoolean(String key) {
     public Integer getInt(String key) {
         return Integer.parseInt(configValues.getOrDefault(key, "false").toString());
     }
+
+    void logConfig() {
+        logger.info("Version Name: {}", getString("versionName"));
+        logger.info("Version Minimum Protocol: {}", getString("versionMinProtocol"));
+        logger.info("Set Hover Info: {}", getString("setHoverInfo"));
+        if (getBoolean("messageOfTheDayOverride")) {
+            logger.info("Message Of The Day: {}", getString("messageOfTheDay"));
+        }
+        if (getBoolean("useMainServer")) {
+            logger.info("Ping Pass-Through-Server: {}", getString("mainServer"));
+        }
+    }
 }

src/main/java/org/zeroBzeroT/serverPingPlayerList/Config.java

@@ -2,6 +2,7 @@
 
 import com.google.inject.Inject;
 import com.velocitypowered.api.command.CommandManager;
+import com.velocitypowered.api.command.CommandMeta;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
 import com.velocitypowered.api.plugin.annotation.DataDirectory;
@@ -25,7 +26,7 @@ public class Main {
     private ServerListListener serverListListener;
 
     private ScheduledTask pingTask;
-    private volatile ServerPing mainPing; // Cached ping from main server, similar to old mainPing
+    private volatile ServerPing mainPing;
 
     @Inject
     public Main(ProxyServer server, Logger logger, @DataDirectory Path dataDirectory) {
@@ -38,7 +39,7 @@ public Main(ProxyServer server, Logger logger, @DataDirectory Path dataDirectory
     public void onProxyInitialize(ProxyInitializeEvent event) {
         logger.info("ServerPingPlayerList is starting up...");
 
-        config = new Config(dataDirectory, logger);
+        config = new Config(this, dataDirectory, logger);
 
         // Register Event Listeners
         serverListListener = new ServerListListener(this, config);
@@ -51,7 +52,7 @@ public void onProxyInitialize(ProxyInitializeEvent event) {
         startPingTask();
 
         // Some output to the console ;)
-        logConfig();
+        config.logConfig();
 
         // TODO Load Plugin Metrics
         if (config.getBoolean("bStats")) {
@@ -62,7 +63,8 @@ public void onProxyInitialize(ProxyInitializeEvent event) {
 
     private void registerCommands() {
         CommandManager commandManager = server.getCommandManager();
-        commandManager.register("spplreload", new ReloadCommand(this, logger));
+        CommandMeta commandMeta = commandManager.metaBuilder("spplreload").plugin(this).build();
+        commandManager.register(commandMeta, new ReloadCommand(this, logger));
     }
 
     public ProxyServer getServer() {
@@ -75,7 +77,7 @@ public ServerPing getMainPing() {
 
     public void reloadConfig() {
         logger.info("Reloading configuration...");
-        Config newConfig = new Config(dataDirectory, logger);
+        Config newConfig = new Config(this, dataDirectory, logger);
         this.config = newConfig;
         serverListListener.setConfig(newConfig);
         startPingTask();
@@ -106,16 +108,4 @@ public void startPingTask() {
             })).repeat(5, TimeUnit.SECONDS).schedule();
         }
     }
-
-    private void logConfig() {
-        logger.info("[config] Version Name: {}", config.getString("versionName"));
-        logger.info("[config] Version Minimum Protocol: {}", config.getString("versionMinProtocol"));
-        logger.info("[config] Set Hover Info: {}", config.getString("setHoverInfo"));
-        if (config.getBoolean("messageOfTheDayOverride")) {
-            logger.info("[config] Message Of The Day: {}", config.getString("messageOfTheDay"));
-        }
-        if (config.getBoolean("useMainServer")) {
-            logger.info("[config] Ping Pass-Through-Server: {}", config.getString("mainServer"));
-        }
-    }
 }