src/main/java/me/oskar3123/staffchat/bungee/command/BungeeStaffChatCommand.java

@@ -11,20 +11,20 @@ import net.md_5.bungee.config.Configuration;
 public class BungeeStaffChatCommand extends Command
 {
 
-    private BungeeMain main;
+    private BungeeMain plugin;
     private Configuration config;
 
-    public BungeeStaffChatCommand(BungeeMain main)
+    public BungeeStaffChatCommand(BungeeMain plugin)
     {
         super("staffchat");
-        this.main = main;
+        this.plugin = plugin;
-        config = main.getConfig();
+        config = plugin.getConfig();
     }
 
     public void execute(CommandSender sender, String[] args)
     {
         BaseComponent[] noPerm = txt(config.getString("messages.prefix") + config.getString("messages.nopermission"));
-        if (!sender.hasPermission(main.commandPerm))
+        if (!sender.hasPermission(plugin.commandPerm))
         {
             sender.sendMessage(noPerm);
             return;
@@ -36,7 +36,7 @@ public class BungeeStaffChatCommand extends Command
         }
         if (args[0].equalsIgnoreCase("reload"))
         {
-            if (sender.hasPermission(main.reloadPerm))
+            if (sender.hasPermission(plugin.reloadPerm))
             {
                 reload(sender);
             }
@@ -52,8 +52,8 @@ public class BungeeStaffChatCommand extends Command
     private void help(CommandSender sender, String label)
     {
         String prefix = config.getString("messages.prefix");
-        sender.sendMessage(txt(prefix + "Version " + main.getDescription().getVersion() + ", made by oskar3123"));
+        sender.sendMessage(txt(prefix + "Version " + plugin.getDescription().getVersion() + ", made by oskar3123"));
-        if (sender.hasPermission(main.reloadPerm))
+        if (sender.hasPermission(plugin.reloadPerm))
         {
             sender.sendMessage(txt(prefix + "/" + label + " reload - Reloads the config file"));
         }
@@ -61,8 +61,8 @@ public class BungeeStaffChatCommand extends Command
 
     private void reload(CommandSender sender)
     {
-        main.reloadConfig();
+        plugin.reloadConfig();
-        config = main.getConfig();
+        config = plugin.getConfig();
         sender.sendMessage(txt(config.getString("messages.prefix") + config.getString("messages.reloaded")));
     }
 

src/main/java/me/oskar3123/staffchat/bungee/event/BungeeChatListener.java

@@ -13,11 +13,11 @@ import net.md_5.bungee.event.EventHandler;
 public class BungeeChatListener implements Listener
 {
 
-    private BungeeMain main;
+    private BungeeMain plugin;
 
-    public BungeeChatListener(BungeeMain main)
+    public BungeeChatListener(BungeeMain plugin)
     {
-        this.main = main;
+        this.plugin = plugin;
     }
 
     @EventHandler
@@ -29,12 +29,12 @@ public class BungeeChatListener implements Listener
         }
 
         ProxiedPlayer player = (ProxiedPlayer) event.getSender();
-        if (!player.hasPermission(main.usePerm))
+        if (!player.hasPermission(plugin.usePerm))
         {
             return;
         }
 
-        Configuration config = main.getConfig();
+        Configuration config = plugin.getConfig();
         String character = config.getString("settings.character");
         if (!event.getMessage().startsWith(character))
         {
@@ -46,10 +46,10 @@ public class BungeeChatListener implements Listener
         format = format.replaceAll("\\{MESSAGE\\}", event.getMessage().substring(character.length()).trim());
         final BaseComponent[] message = txt(format);
 
-        main.getProxy().getPlayers().stream()
+        plugin.getProxy().getPlayers().stream()
-                .filter(p -> p.hasPermission(main.seePerm))
+                .filter(p -> p.hasPermission(plugin.seePerm))
                 .forEach(p -> p.sendMessage(message));
-        main.getLogger().info(ChatColor.stripColor(clr(format)));
+        plugin.getLogger().info(ChatColor.stripColor(clr(format)));
 
         event.setCancelled(true);
     }

src/main/java/me/oskar3123/staffchat/spigot/command/StaffChatCommand.java

@@ -10,21 +10,21 @@ import org.bukkit.configuration.file.FileConfiguration;
 public class StaffChatCommand implements CommandExecutor
 {
 
-    private Main main;
+    private Main plugin;
     private FileConfiguration config;
 
-    public StaffChatCommand(Main main)
+    public StaffChatCommand(Main plugin)
     {
-        this.main = main;
+        this.plugin = plugin;
-        config = main.getConfig();
+        config = plugin.getConfig();
     }
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args)
     {
-        String noPerm = clr(config.getString("messages.prefix") + config.getString("messages.nopermission"));
+        if (!sender.hasPermission(plugin.commandPerm))
-        if (!sender.hasPermission(main.commandPerm))
         {
+            String noPerm = clr(config.getString("messages.prefix") + config.getString("messages.nopermission"));
             sender.sendMessage(noPerm);
             return true;
         }
@@ -35,7 +35,7 @@ public class StaffChatCommand implements CommandExecutor
         }
         if (args[0].equalsIgnoreCase("reload"))
         {
-            if (sender.hasPermission(main.reloadPerm))
+            if (sender.hasPermission(plugin.reloadPerm))
             {
                 reload(sender);
             }
@@ -52,8 +52,8 @@ public class StaffChatCommand implements CommandExecutor
     private void help(CommandSender sender, String label)
     {
         String prefix = clr(config.getString("messages.prefix"));
-        sender.sendMessage(prefix + "Version " + main.getDescription().getVersion() + ", made by oskar3123");
+        sender.sendMessage(prefix + "Version " + plugin.getDescription().getVersion() + ", made by oskar3123");
-        if (sender.hasPermission(main.reloadPerm))
+        if (sender.hasPermission(plugin.reloadPerm))
         {
             sender.sendMessage(prefix + "/" + label + " reload - Reloads the config file");
         }
@@ -61,8 +61,8 @@ public class StaffChatCommand implements CommandExecutor
 
     private void reload(CommandSender sender)
     {
-        main.reloadConfig();
+        plugin.reloadConfig();
-        config = main.getConfig();
+        config = plugin.getConfig();
         sender.sendMessage(clr(config.getString("messages.prefix") + config.getString("messages.reloaded")));
     }
 

src/main/java/me/oskar3123/staffchat/spigot/event/ChatListener.java

@@ -12,22 +12,22 @@ import org.bukkit.event.player.AsyncPlayerChatEvent;
 public class ChatListener implements Listener
 {
 
-    private Main main;
+    private Main plugin;
 
-    public ChatListener(Main main)
+    public ChatListener(Main plugin)
     {
-        this.main = main;
+        this.plugin = plugin;
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void chat(AsyncPlayerChatEvent event)
     {
-        if (!event.getPlayer().hasPermission(main.usePerm))
+        if (!event.getPlayer().hasPermission(plugin.usePerm))
         {
             return;
         }
 
-        FileConfiguration config = main.getConfig();
+        FileConfiguration config = plugin.getConfig();
         String character = config.getString("settings.character");
         if (!event.getMessage().startsWith(character))
         {
@@ -37,20 +37,15 @@ public class ChatListener implements Listener
         String format = config.getString("settings.format");
         format = format.replaceAll("\\{NAME\\}", event.getPlayer().getName());
         format = format.replaceAll("\\{MESSAGE\\}", event.getMessage().substring(character.length()).trim());
-        format = clr(format);
+        format = ChatColor.translateAlternateColorCodes('&', format);
         final String message = format;
 
         Bukkit.getOnlinePlayers().stream()
-                .filter(p -> p.hasPermission(main.seePerm))
+                .filter(p -> p.hasPermission(plugin.seePerm))
                 .forEach(p -> p.sendMessage(message));
-        main.getLogger().info(ChatColor.stripColor(message));
+        plugin.getLogger().info(ChatColor.stripColor(message));
 
         event.setCancelled(true);
     }
 
-    private String clr(String string)
-    {
-        return ChatColor.translateAlternateColorCodes('&', string);
-    }
-
 }