From 795c869fc035e5367d588e1745f0049a48b980ef Mon Sep 17 00:00:00 2001
From: Dawson Hessler <funkemunkybiz@gmail.com>
Date: Sun, 28 Aug 2022 12:11:41 -0400
Subject: [PATCH] Fixed reloading and adding of messages into config

---
 .../main/java/dev/brighten/antivpn/bukkit/BukkitPlugin.java   | 2 ++
 Common/src/main/java/dev/brighten/antivpn/AntiVPN.java        | 4 +++-
 .../java/dev/brighten/antivpn/command/impl/ReloadCommand.java | 2 ++
 .../java/dev/brighten/antivpn/message/MessageHandler.java     | 4 ++++
 .../src/main/java/dev/brighten/antivpn/message/VpnString.java | 3 +--
 Common/src/main/resources/config.yml                          | 4 +++-
 6 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Bukkit/src/main/java/dev/brighten/antivpn/bukkit/BukkitPlugin.java b/Bukkit/src/main/java/dev/brighten/antivpn/bukkit/BukkitPlugin.java
index fb80508..8a5c550 100644
--- a/Bukkit/src/main/java/dev/brighten/antivpn/bukkit/BukkitPlugin.java
+++ b/Bukkit/src/main/java/dev/brighten/antivpn/bukkit/BukkitPlugin.java
@@ -77,6 +77,8 @@ public class BukkitPlugin extends JavaPlugin {
                 (vpnString.getDefaultMessage(), "messages." + vpnString.getKey(), BukkitPlugin.pluginInstance)
                 .get());
         AntiVPN.getInstance().getMessageHandler().reloadStrings();*/
+
+        reloadConfig();
     }
 
     @Override
diff --git a/Common/src/main/java/dev/brighten/antivpn/AntiVPN.java b/Common/src/main/java/dev/brighten/antivpn/AntiVPN.java
index 09e609d..4fca9aa 100644
--- a/Common/src/main/java/dev/brighten/antivpn/AntiVPN.java
+++ b/Common/src/main/java/dev/brighten/antivpn/AntiVPN.java
@@ -115,6 +115,7 @@ public class AntiVPN {
         AntiVPN.getInstance().getMessageHandler().initStrings(vpnString -> new ConfigDefault<>
                 (vpnString.getDefaultMessage(), "messages." + vpnString.getKey(), AntiVPN.getInstance())
                 .get());
+        AntiVPN.getInstance().getMessageHandler().reloadStrings();
     }
 
     public InputStream getResource(String filename) {
@@ -158,7 +159,8 @@ public class AntiVPN {
 
     public void reloadConfig() {
         try {
-            ConfigurationProvider.getProvider(YamlConfiguration.class)
+
+            config = ConfigurationProvider.getProvider(YamlConfiguration.class)
                     .load(new File(pluginFolder.getPath() + File.separator + "config.yml"));
         } catch (IOException e) {
             throw new RuntimeException(e);
diff --git a/Common/src/main/java/dev/brighten/antivpn/command/impl/ReloadCommand.java b/Common/src/main/java/dev/brighten/antivpn/command/impl/ReloadCommand.java
index 8f4f74b..ab5a463 100644
--- a/Common/src/main/java/dev/brighten/antivpn/command/impl/ReloadCommand.java
+++ b/Common/src/main/java/dev/brighten/antivpn/command/impl/ReloadCommand.java
@@ -53,6 +53,8 @@ public class ReloadCommand extends Command {
         // Updating the cache of these values in VPNConfig
         AntiVPN.getInstance().getVpnConfig().update();
 
+        AntiVPN.getInstance().getMessageHandler().reloadStrings();
+
         // Clearing the local response cache
         VPNExecutor.responseCache.clear();
 
diff --git a/Common/src/main/java/dev/brighten/antivpn/message/MessageHandler.java b/Common/src/main/java/dev/brighten/antivpn/message/MessageHandler.java
index 59da303..b3e2a87 100644
--- a/Common/src/main/java/dev/brighten/antivpn/message/MessageHandler.java
+++ b/Common/src/main/java/dev/brighten/antivpn/message/MessageHandler.java
@@ -1,5 +1,7 @@
 package dev.brighten.antivpn.message;
 
+import dev.brighten.antivpn.AntiVPN;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Function;
@@ -27,6 +29,8 @@ public class MessageHandler {
 
     public void addString(VpnString string, Function<VpnString, String> getter) {
         string.setConfigStringGetter(getter);
+        getter.apply(string);
+        System.out.println("Added string " + string.getKey());
         messages.put(string.getKey(), string);
     }
 
diff --git a/Common/src/main/java/dev/brighten/antivpn/message/VpnString.java b/Common/src/main/java/dev/brighten/antivpn/message/VpnString.java
index e6a7e64..fa6e118 100644
--- a/Common/src/main/java/dev/brighten/antivpn/message/VpnString.java
+++ b/Common/src/main/java/dev/brighten/antivpn/message/VpnString.java
@@ -19,7 +19,6 @@ public class VpnString {
     public VpnString(String key, String defaultMessage) {
         this.key = key;
         this.defaultMessage = defaultMessage;
-        this.message = defaultMessage;
     }
 
     @SneakyThrows
@@ -30,7 +29,7 @@ public class VpnString {
     }
 
     public String getFormattedMessage(Var<String, Object>... replacements) {
-        String formatted = message;
+        String formatted = configStringGetter.apply(this);
 
         for (Var<String, Object> replacement : replacements) {
             formatted = formatted
diff --git a/Common/src/main/resources/config.yml b/Common/src/main/resources/config.yml
index ab4945a..6600305 100644
--- a/Common/src/main/resources/config.yml
+++ b/Common/src/main/resources/config.yml
@@ -61,7 +61,9 @@ countries:
   commands: []
   # The kick message that will be used if commands are configured to use the built-in kicking sytem.
   # PlaceHolders: %country% (Country name), %player% (Player name), %code% (Country ISO Code)
-  vanillaKickReason: "&cSorry, but our server does not allow connections from\n&f%country%"
+  vanillaKickReason: |-
+    &cSorry, but our server does not allow connections from
+    &f%country%
 # This will disable any information being sent to https://bstats.org. We recommend you keep this enabled as it helps
 # us understand our users and put effort where it is needed. All information sent goes under their privacy as seen
 # here: https://bstats.org/privacy-policy