From 9b5f5686756d317dd5d922ea1bdcc38296a184fb Mon Sep 17 00:00:00 2001 From: oskar3123 Date: Thu, 4 May 2017 10:24:07 +0200 Subject: [PATCH 1/4] better naming conventions --- .../staffchat/spigot/event/ChatListener.java | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/src/main/java/me/oskar3123/staffchat/spigot/event/ChatListener.java b/src/main/java/me/oskar3123/staffchat/spigot/event/ChatListener.java index f005209..bc62382 100644 --- a/src/main/java/me/oskar3123/staffchat/spigot/event/ChatListener.java +++ b/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); - } - } From c8676637ed32085078c20494647337aeed3b6932 Mon Sep 17 00:00:00 2001 From: oskar3123 Date: Thu, 4 May 2017 10:26:15 +0200 Subject: [PATCH 2/4] better naming conventions --- .../spigot/command/StaffChatCommand.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/me/oskar3123/staffchat/spigot/command/StaffChatCommand.java b/src/main/java/me/oskar3123/staffchat/spigot/command/StaffChatCommand.java index 89b9888..0e2b191 100644 --- a/src/main/java/me/oskar3123/staffchat/spigot/command/StaffChatCommand.java +++ b/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; - config = main.getConfig(); + this.plugin = plugin; + 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(main.commandPerm)) + if (!sender.hasPermission(plugin.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"); - if (sender.hasPermission(main.reloadPerm)) + sender.sendMessage(prefix + "Version " + plugin.getDescription().getVersion() + ", made by oskar3123"); + 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(); - config = main.getConfig(); + plugin.reloadConfig(); + config = plugin.getConfig(); sender.sendMessage(clr(config.getString("messages.prefix") + config.getString("messages.reloaded"))); } From 2d8cac9ac23d5d2348e291113eef7c25938369bc Mon Sep 17 00:00:00 2001 From: oskar3123 Date: Thu, 4 May 2017 10:28:01 +0200 Subject: [PATCH 3/4] better naming conventions --- .../bungee/event/BungeeChatListener.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/me/oskar3123/staffchat/bungee/event/BungeeChatListener.java b/src/main/java/me/oskar3123/staffchat/bungee/event/BungeeChatListener.java index f9190af..a947e48 100644 --- a/src/main/java/me/oskar3123/staffchat/bungee/event/BungeeChatListener.java +++ b/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() - .filter(p -> p.hasPermission(main.seePerm)) + plugin.getProxy().getPlayers().stream() + .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); } From 5c20c41c2167447f978e06784458a5bcccc8dd8c Mon Sep 17 00:00:00 2001 From: oskar3123 Date: Thu, 4 May 2017 10:29:04 +0200 Subject: [PATCH 4/4] better naming conventions --- .../command/BungeeStaffChatCommand.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/me/oskar3123/staffchat/bungee/command/BungeeStaffChatCommand.java b/src/main/java/me/oskar3123/staffchat/bungee/command/BungeeStaffChatCommand.java index 2aca096..4c4283e 100644 --- a/src/main/java/me/oskar3123/staffchat/bungee/command/BungeeStaffChatCommand.java +++ b/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; - config = main.getConfig(); + this.plugin = plugin; + 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")); - if (sender.hasPermission(main.reloadPerm)) + sender.sendMessage(txt(prefix + "Version " + plugin.getDescription().getVersion() + ", made by oskar3123")); + 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(); - config = main.getConfig(); + plugin.reloadConfig(); + config = plugin.getConfig(); sender.sendMessage(txt(config.getString("messages.prefix") + config.getString("messages.reloaded"))); }