diff --git a/Bukkit/src/main/java/dev/brighten/antivpn/bukkit/command/BukkitCommand.java b/Bukkit/src/main/java/dev/brighten/antivpn/bukkit/command/BukkitCommand.java index 4eb4764..2e3ecd4 100644 --- a/Bukkit/src/main/java/dev/brighten/antivpn/bukkit/command/BukkitCommand.java +++ b/Bukkit/src/main/java/dev/brighten/antivpn/bukkit/command/BukkitCommand.java @@ -1,5 +1,6 @@ package dev.brighten.antivpn.bukkit.command; +import dev.brighten.antivpn.AntiVPN; import dev.brighten.antivpn.bukkit.BukkitCommandExecutor; import dev.brighten.antivpn.command.Command; import lombok.val; @@ -41,7 +42,8 @@ public class BukkitCommand extends org.bukkit.command.Command { public boolean execute(CommandSender sender, String s, String[] args) { if(!sender.hasPermission("antivpn.command.*") && !sender.hasPermission(command.permission())) { - sender.sendMessage(ChatColor.RED + "No permission."); + sender.sendMessage(ChatColor.translateAlternateColorCodes('&', + AntiVPN.getInstance().getMessageHandler().getString("no-permission").getMessage())); return true; } @@ -53,7 +55,8 @@ public class BukkitCommand extends org.bukkit.command.Command { .anyMatch(alias -> alias.equalsIgnoreCase(args[0]))) { if(!sender.hasPermission("antivpn.command.*") && !sender.hasPermission(child.permission())) { - sender.sendMessage(ChatColor.RED + "No permission."); + sender.sendMessage(ChatColor.translateAlternateColorCodes('&', + AntiVPN.getInstance().getMessageHandler().getString("no-permission").getMessage())); return true; } diff --git a/Bungee/src/main/java/dev/brighten/antivpn/bungee/command/BungeeCommand.java b/Bungee/src/main/java/dev/brighten/antivpn/bungee/command/BungeeCommand.java index 775b6ac..201fa15 100644 --- a/Bungee/src/main/java/dev/brighten/antivpn/bungee/command/BungeeCommand.java +++ b/Bungee/src/main/java/dev/brighten/antivpn/bungee/command/BungeeCommand.java @@ -1,5 +1,6 @@ package dev.brighten.antivpn.bungee.command; +import dev.brighten.antivpn.AntiVPN; import lombok.val; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.CommandSender; @@ -14,9 +15,6 @@ import java.util.stream.IntStream; public class BungeeCommand extends Command implements TabExecutor { - private static final BaseComponent[] noPermission = new ComponentBuilder("No permission").color(ChatColor.RED) - .create(); - private final dev.brighten.antivpn.command.Command command; public BungeeCommand(dev.brighten.antivpn.command.Command command) { super(command.name(), command.permission(), command.aliases()); @@ -28,7 +26,8 @@ public class BungeeCommand extends Command implements TabExecutor { public void execute(CommandSender sender, String[] args) { if(!sender.hasPermission("antivpn.command.*") && !sender.hasPermission(command.permission())) { - sender.sendMessage(noPermission); + sender.sendMessage(TextComponent.fromLegacyText(ChatColor.translateAlternateColorCodes('&', + AntiVPN.getInstance().getMessageHandler().getString("no-permission").getMessage()))); return; } @@ -40,7 +39,8 @@ public class BungeeCommand extends Command implements TabExecutor { .anyMatch(alias -> alias.equalsIgnoreCase(args[0]))) { if(!sender.hasPermission("antivpn.command.*") && !sender.hasPermission(child.permission())) { - sender.sendMessage(noPermission); + sender.sendMessage(TextComponent.fromLegacyText(ChatColor.translateAlternateColorCodes('&', + AntiVPN.getInstance().getMessageHandler().getString("no-permission").getMessage()))); return; } 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 6ca06c7..59da303 100644 --- a/Common/src/main/java/dev/brighten/antivpn/message/MessageHandler.java +++ b/Common/src/main/java/dev/brighten/antivpn/message/MessageHandler.java @@ -37,5 +37,6 @@ public class MessageHandler { "&7Your player proxy notifications have been set to: &e%state%"), getter); addString(new VpnString("command-reload-complete", "&aSuccessfully reloaded KauriVPN plugin!"), getter); + addString(new VpnString("no-permission", "&cNo permission."), getter); } } diff --git a/Velocity/src/main/java/dev/brighten/antivpn/velocity/command/VelocityCommand.java b/Velocity/src/main/java/dev/brighten/antivpn/velocity/command/VelocityCommand.java index f58a71e..e00a288 100644 --- a/Velocity/src/main/java/dev/brighten/antivpn/velocity/command/VelocityCommand.java +++ b/Velocity/src/main/java/dev/brighten/antivpn/velocity/command/VelocityCommand.java @@ -2,6 +2,7 @@ package dev.brighten.antivpn.velocity.command; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.command.SimpleCommand; +import dev.brighten.antivpn.AntiVPN; import dev.brighten.antivpn.command.Command; import lombok.val; import net.kyori.adventure.text.Component; @@ -26,8 +27,9 @@ public class VelocityCommand implements SimpleCommand { CommandSource sender = invocation.source(); if(!invocation.source().hasPermission("antivpn.command.*") && !invocation.source().hasPermission(command.permission())) { - invocation.source().sendMessage(Component.text("No permission").toBuilder() - .color(TextColor.color(255,0,0)).build()); + invocation.source().sendMessage(LegacyComponentSerializer.builder().character('&') + .build().deserialize(AntiVPN.getInstance().getMessageHandler() + .getString("no-permission").getMessage())); return; } @@ -40,6 +42,9 @@ public class VelocityCommand implements SimpleCommand { .anyMatch(alias -> alias.equalsIgnoreCase(args[0]))) { if(!sender.hasPermission("antivpn.command.*") && !sender.hasPermission(child.permission())) { + invocation.source().sendMessage(LegacyComponentSerializer.builder().character('&') + .build().deserialize(AntiVPN.getInstance().getMessageHandler() + .getString("no-permission").getMessage())); invocation.source().sendMessage(Component.text("No permission") .toBuilder().color(TextColor.color(255,0,0)).build()); return;