diff --git a/Assembly/dependency-reduced-pom.xml b/Assembly/dependency-reduced-pom.xml index 9e49b30..187caa7 100644 --- a/Assembly/dependency-reduced-pom.xml +++ b/Assembly/dependency-reduced-pom.xml @@ -3,7 +3,7 @@ AntiVPN dev.brighten.antivpn - 1.8 + 1.8.1 4.0.0 Assembly diff --git a/Assembly/pom.xml b/Assembly/pom.xml index e06ea4d..e385fe3 100644 --- a/Assembly/pom.xml +++ b/Assembly/pom.xml @@ -5,7 +5,7 @@ AntiVPN dev.brighten.antivpn - 1.8 + 1.8.1 4.0.0 diff --git a/Bukkit/dependency-reduced-pom.xml b/Bukkit/dependency-reduced-pom.xml index 9e87c11..9a52dbb 100644 --- a/Bukkit/dependency-reduced-pom.xml +++ b/Bukkit/dependency-reduced-pom.xml @@ -3,7 +3,7 @@ AntiVPN dev.brighten.antivpn - 1.8 + 1.8.1 4.0.0 Bukkit @@ -56,7 +56,7 @@ dev.brighten.antivpn Common - 1.8 + 1.8.1 provided diff --git a/Bukkit/pom.xml b/Bukkit/pom.xml index 6a0561f..f437378 100644 --- a/Bukkit/pom.xml +++ b/Bukkit/pom.xml @@ -5,7 +5,7 @@ AntiVPN dev.brighten.antivpn - 1.8 + 1.8.1 4.0.0 @@ -69,7 +69,7 @@ dev.brighten.antivpn Common - 1.8 + 1.8.1 provided diff --git a/Bungee/dependency-reduced-pom.xml b/Bungee/dependency-reduced-pom.xml index 8df74b3..6e0518b 100644 --- a/Bungee/dependency-reduced-pom.xml +++ b/Bungee/dependency-reduced-pom.xml @@ -3,7 +3,7 @@ AntiVPN dev.brighten.antivpn - 1.8 + 1.8.1 4.0.0 Bungee @@ -50,7 +50,7 @@ dev.brighten.antivpn Common - 1.8 + 1.8.1 provided diff --git a/Bungee/pom.xml b/Bungee/pom.xml index 1919049..d2e1a58 100644 --- a/Bungee/pom.xml +++ b/Bungee/pom.xml @@ -5,7 +5,7 @@ AntiVPN dev.brighten.antivpn - 1.8 + 1.8.1 4.0.0 @@ -63,7 +63,7 @@ dev.brighten.antivpn Common - 1.8 + 1.8.1 provided 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 f772cf5..160aa20 100644 --- a/Bungee/src/main/java/dev/brighten/antivpn/bungee/BungeePlugin.java +++ b/Bungee/src/main/java/dev/brighten/antivpn/bungee/BungeePlugin.java @@ -3,6 +3,7 @@ package dev.brighten.antivpn.bungee; import dev.brighten.antivpn.AntiVPN; import dev.brighten.antivpn.bungee.command.BungeeCommand; import dev.brighten.antivpn.command.Command; +import dev.brighten.antivpn.command.impl.AntiVPNCommand; import dev.brighten.antivpn.utils.ConfigDefault; import net.md_5.bungee.BungeeCord; import net.md_5.bungee.api.plugin.Plugin; @@ -44,11 +45,6 @@ public class BungeePlugin extends Plugin { for (Command command : AntiVPN.getInstance().getCommands()) { BungeeCord.getInstance().getPluginManager().registerCommand(pluginInstance, new BungeeCommand(command)); } - - BungeeCord.getInstance().getLogger().info("Getting strings..."); - AntiVPN.getInstance().getMessageHandler().initStrings(vpnString -> new ConfigDefault<> - (vpnString.getDefaultMessage(), "messages." + vpnString.getKey(), AntiVPN.getInstance()) - .get()); } @Override diff --git a/Common/pom.xml b/Common/pom.xml index 28dbdbd..a5f8954 100644 --- a/Common/pom.xml +++ b/Common/pom.xml @@ -5,7 +5,7 @@ AntiVPN dev.brighten.antivpn - 1.8 + 1.8.1 4.0.0 diff --git a/Common/src/main/java/dev/brighten/antivpn/AntiVPN.java b/Common/src/main/java/dev/brighten/antivpn/AntiVPN.java index 4fa5774..09e609d 100644 --- a/Common/src/main/java/dev/brighten/antivpn/AntiVPN.java +++ b/Common/src/main/java/dev/brighten/antivpn/AntiVPN.java @@ -156,6 +156,15 @@ public class AntiVPN { } } + public void reloadConfig() { + try { + ConfigurationProvider.getProvider(YamlConfiguration.class) + .load(new File(pluginFolder.getPath() + File.separator + "config.yml")); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + private void registerCommands() { commands.add(new AntiVPNCommand()); } diff --git a/Common/src/main/java/dev/brighten/antivpn/command/impl/AntiVPNCommand.java b/Common/src/main/java/dev/brighten/antivpn/command/impl/AntiVPNCommand.java index e0d0dc8..48c0fda 100644 --- a/Common/src/main/java/dev/brighten/antivpn/command/impl/AntiVPNCommand.java +++ b/Common/src/main/java/dev/brighten/antivpn/command/impl/AntiVPNCommand.java @@ -45,7 +45,7 @@ public class AntiVPNCommand extends Command { @Override public Command[] children() { return new Command[] {new LookupCommand(), new AllowlistCommand(), new AlertsCommand(), - new ClearCacheCommand(), new PlanCommand()}; + new ClearCacheCommand(), new PlanCommand(), new ReloadCommand()}; } @Override 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 new file mode 100644 index 0000000..8f4f74b --- /dev/null +++ b/Common/src/main/java/dev/brighten/antivpn/command/impl/ReloadCommand.java @@ -0,0 +1,66 @@ +package dev.brighten.antivpn.command.impl; + +import dev.brighten.antivpn.AntiVPN; +import dev.brighten.antivpn.api.VPNExecutor; +import dev.brighten.antivpn.command.Command; +import dev.brighten.antivpn.command.CommandExecutor; +import dev.brighten.antivpn.message.VpnString; + +import java.util.Collections; +import java.util.List; + +public class ReloadCommand extends Command { + @Override + public String permission() { + return "antivpn.command.reload"; + } + + @Override + public String name() { + return "reload"; + } + + @Override + public String[] aliases() { + return new String[0]; + } + + @Override + public String description() { + return "Reload the plugin"; + } + + @Override + public String usage() { + return ""; + } + + @Override + public String parent() { + return "antivpn"; + } + + @Override + public Command[] children() { + return new Command[0]; + } + + @Override + public String execute(CommandExecutor executor, String[] args) { + // Loading changes from the config.yml + AntiVPN.getInstance().reloadConfig(); + + // Updating the cache of these values in VPNConfig + AntiVPN.getInstance().getVpnConfig().update(); + + // Clearing the local response cache + VPNExecutor.responseCache.clear(); + + return AntiVPN.getInstance().getMessageHandler().getString("command-reload-complete").getMessage(); + } + + @Override + public List tabComplete(CommandExecutor executor, String alias, String[] args) { + return Collections.emptyList(); + } +} 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 a7821fd..6ca06c7 100644 --- a/Common/src/main/java/dev/brighten/antivpn/message/MessageHandler.java +++ b/Common/src/main/java/dev/brighten/antivpn/message/MessageHandler.java @@ -35,5 +35,7 @@ public class MessageHandler { "&cYou must be a player to execute this command!"), getter); addString(new VpnString("command-alerts-toggled", "&7Your player proxy notifications have been set to: &e%state%"), getter); + addString(new VpnString("command-reload-complete", + "&aSuccessfully reloaded KauriVPN plugin!"), getter); } } diff --git a/Velocity/pom.xml b/Velocity/pom.xml index cfd8b5e..7d65776 100644 --- a/Velocity/pom.xml +++ b/Velocity/pom.xml @@ -5,7 +5,7 @@ AntiVPN dev.brighten.antivpn - 1.8 + 1.8.1 4.0.0 @@ -33,7 +33,7 @@ dev.brighten.antivpn Common - 1.8 + 1.8.1 provided diff --git a/pom.xml b/pom.xml index 8d4e955..e4fdb46 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ dev.brighten.antivpn AntiVPN pom - 1.8 + 1.8.1 Common