From 723aa6a127fa7d01d3146e0ca3226165ddb792d6 Mon Sep 17 00:00:00 2001 From: funkemunky Date: Thu, 9 Sep 2021 15:35:25 -0400 Subject: [PATCH] Fixing messages from config not loading or setting --- .../dev/brighten/antivpn/bukkit/BukkitPlugin.java | 11 ++++++----- .../dev/brighten/antivpn/bungee/BungeePlugin.java | 11 ++++++----- .../src/main/java/dev/brighten/antivpn/AntiVPN.java | 1 - 3 files changed, 12 insertions(+), 11 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 fd8ad2b..70101aa 100644 --- a/Bukkit/src/main/java/dev/brighten/antivpn/bukkit/BukkitPlugin.java +++ b/Bukkit/src/main/java/dev/brighten/antivpn/bukkit/BukkitPlugin.java @@ -40,11 +40,6 @@ public class BukkitPlugin extends JavaPlugin { Bukkit.getLogger().info("Starting AntiVPN services..."); AntiVPN.start(new BukkitConfig(), new BukkitListener(), new BukkitPlayerExecutor()); - Bukkit.getLogger().info("Getting strings..."); - AntiVPN.getInstance().getMessageHandler().initStrings(vpnString -> new ConfigDefault<> - (vpnString.getDefaultMessage(), "messages." + vpnString.getKey(), BukkitPlugin.pluginInstance) - .get()); - if(AntiVPN.getInstance().getConfig().metrics()) { Bukkit.getLogger().info("Starting bStats metrics..."); Metrics metrics = new Metrics(this, 12615); @@ -131,6 +126,12 @@ public class BukkitPlugin extends JavaPlugin { registeredCommands.add(newCommand); commandMap.register(pluginInstance.getName(), newCommand); } + + Bukkit.getLogger().info("Getting strings..."); + AntiVPN.getInstance().getMessageHandler().initStrings(vpnString -> new ConfigDefault<> + (vpnString.getDefaultMessage(), "messages." + vpnString.getKey(), BukkitPlugin.pluginInstance) + .get()); + AntiVPN.getInstance().getMessageHandler().reloadStrings(); } @Override diff --git a/Bungee/src/main/java/dev/brighten/antivpn/bungee/BungeePlugin.java b/Bungee/src/main/java/dev/brighten/antivpn/bungee/BungeePlugin.java index c77f367..3fe26ed 100644 --- a/Bungee/src/main/java/dev/brighten/antivpn/bungee/BungeePlugin.java +++ b/Bungee/src/main/java/dev/brighten/antivpn/bungee/BungeePlugin.java @@ -44,11 +44,6 @@ public class BungeePlugin extends Plugin { BungeeCord.getInstance().getLogger().info("Starting AntiVPN services..."); AntiVPN.start(new BungeeConfig(), new BungeeListener(), new BungeePlayerExecutor()); - BungeeCord.getInstance().getLogger().info("Getting strings..."); - AntiVPN.getInstance().getMessageHandler().initStrings(vpnString -> new ConfigDefault<> - (vpnString.getDefaultMessage(), "messages." + vpnString.getKey(), BungeePlugin.pluginInstance) - .get()); - if(AntiVPN.getInstance().getConfig().metrics()) { BungeeCord.getInstance().getLogger().info("Starting bStats metrics..."); Metrics metrics = new Metrics(this, 12616); @@ -105,6 +100,12 @@ public class BungeePlugin extends Plugin { } }); } + + BungeeCord.getInstance().getLogger().info("Getting strings..."); + AntiVPN.getInstance().getMessageHandler().initStrings(vpnString -> new ConfigDefault<> + (vpnString.getDefaultMessage(), "messages." + vpnString.getKey(), BungeePlugin.pluginInstance) + .get()); + AntiVPN.getInstance().getMessageHandler().reloadStrings(); } @Override diff --git a/Common/src/main/java/dev/brighten/antivpn/AntiVPN.java b/Common/src/main/java/dev/brighten/antivpn/AntiVPN.java index 53dade0..62541df 100644 --- a/Common/src/main/java/dev/brighten/antivpn/AntiVPN.java +++ b/Common/src/main/java/dev/brighten/antivpn/AntiVPN.java @@ -5,7 +5,6 @@ import dev.brighten.antivpn.api.VPNConfig; import dev.brighten.antivpn.api.VPNExecutor; import dev.brighten.antivpn.command.Command; import dev.brighten.antivpn.command.impl.AntiVPNCommand; -import dev.brighten.antivpn.command.impl.LookupCommand; import dev.brighten.antivpn.database.VPNDatabase; import dev.brighten.antivpn.database.sql.MySqlVPN; import dev.brighten.antivpn.message.MessageHandler;