From 035667e6a0124817a4e39a0d28683559c6670d02 Mon Sep 17 00:00:00 2001 From: Pepich Date: Thu, 25 Jan 2018 12:39:59 +0100 Subject: [PATCH] Applied formatter --- src/com/redstoner/modules/ignore/Ignore.java | 119 ++++++++++--------- 1 file changed, 62 insertions(+), 57 deletions(-) diff --git a/src/com/redstoner/modules/ignore/Ignore.java b/src/com/redstoner/modules/ignore/Ignore.java index 06290d0..a77ca96 100644 --- a/src/com/redstoner/modules/ignore/Ignore.java +++ b/src/com/redstoner/modules/ignore/Ignore.java @@ -24,16 +24,16 @@ import com.redstoner.modules.datamanager.DataManager; import net.nemez.chatapi.click.Message; - @Commands(CommandHolderType.File) @AutoRegisterListener @Version(major = 4, minor = 0, revision = 0, compatible = 4) -public class Ignore implements Module { +public class Ignore implements Module +{ @Command(hook = "unignore", async = AsyncType.ALWAYS) public boolean unignore(CommandSender sender, String player) { - return ignore(sender,player,false); + return ignore(sender, player, false); } @Command(hook = "ignore", async = AsyncType.ALWAYS) @@ -43,24 +43,26 @@ public class Ignore implements Module { } @Command(hook = "list", async = AsyncType.ALWAYS) - public boolean list(CommandSender sender) { + public boolean list(CommandSender sender) + { getLogger().message(sender, "§7You are currently ignoring:"); JSONArray ignores = (JSONArray) DataManager.getOrDefault(sender, "ignores", new JSONArray()); - - if ( ignores.isEmpty() ) { + if (ignores.isEmpty()) + { new Message(sender, null).appendText(" §7Nobody \\o/").send(); return true; } String players; - OfflinePlayer pi = Bukkit.getOfflinePlayer(UUID.fromString((String)ignores.get(0))); + OfflinePlayer pi = Bukkit.getOfflinePlayer(UUID.fromString((String) ignores.get(0))); players = " §3" + pi.getName() + "§7"; - for (int i = 1; i < ignores.size(); i++) { - OfflinePlayer p = Bukkit.getOfflinePlayer(UUID.fromString((String)ignores.get(i))); - players += ", §3" + p.getName() + "§7"; + for (int i = 1; i < ignores.size(); i++) + { + OfflinePlayer p = Bukkit.getOfflinePlayer(UUID.fromString((String) ignores.get(i))); + players += ", §3" + p.getName() + "§7"; } Message m = new Message(sender, null); @@ -69,68 +71,72 @@ public class Ignore implements Module { return true; } - @SuppressWarnings({ "unchecked", "deprecation" }) + @SuppressWarnings({"unchecked", "deprecation"}) public boolean ignore(CommandSender sender, String player, boolean allowIgnore) { JSONArray ignores = (JSONArray) DataManager.getOrDefault(sender, "ignores", new JSONArray()); - Player p = Utils.isUUID(player)? - Bukkit.getPlayer(UUID.fromString(player)) : - Bukkit.getPlayer(player); - - OfflinePlayer op = Utils.isUUID(player)? - Bukkit.getOfflinePlayer(UUID.fromString(player)) : - Bukkit.getOfflinePlayer(player); - - String pName = p != null? p.getDisplayName() : op.getName(); - String pUUID = p != null? p.getUniqueId().toString() : op.getUniqueId().toString(); - String sUUID = ((Player) sender).getUniqueId().toString(); - - if (pUUID.equals(sUUID)) { - getLogger().message(sender, true, "§7You can't ignore yourself :P"); - return true; - } - - if (ignores.contains(pUUID)) { - ignores.remove(pUUID); - getLogger().message(sender, "§7You are no longer ignoring §3" + pName + "§7."); - } - else if (!allowIgnore){ - getLogger().message(sender, "§7You weren't ignoring §3" + pName + "§7."); - } - else { - ignores.add(pUUID); - getLogger().message(sender, "§7You are now ignoring §3" + pName + "§7."); - } - DataManager.setData(sender, "ignores", ignores); - return true; + Player p = Utils.isUUID(player) ? Bukkit.getPlayer(UUID.fromString(player)) : Bukkit.getPlayer(player); + OfflinePlayer op = Utils.isUUID(player) ? Bukkit.getOfflinePlayer(UUID.fromString(player)) + : Bukkit.getOfflinePlayer(player); + + String pName = p != null ? p.getDisplayName() : op.getName(); + String pUUID = p != null ? p.getUniqueId().toString() : op.getUniqueId().toString(); + String sUUID = ((Player) sender).getUniqueId().toString(); + + if (pUUID.equals(sUUID)) + { + getLogger().message(sender, true, "§7You can't ignore yourself :P"); + return true; + } + + if (ignores.contains(pUUID)) + { + ignores.remove(pUUID); + getLogger().message(sender, "§7You are no longer ignoring §3" + pName + "§7."); + } + else if (!allowIgnore) + { + getLogger().message(sender, "§7You weren't ignoring §3" + pName + "§7."); + } + else + { + ignores.add(pUUID); + getLogger().message(sender, "§7You are now ignoring §3" + pName + "§7."); + } + DataManager.setData(sender, "ignores", ignores); + return true; } - public static BroadcastFilter getIgnoredBy(CommandSender sender) { + public static BroadcastFilter getIgnoredBy(CommandSender sender) + { try - { - Module mod = ModuleLoader.getModule("Ignore"); - Method m = mod.getClass().getDeclaredMethod("_getIgnoredBy", CommandSender.class); - m.setAccessible(true); - return (BroadcastFilter) m.invoke(mod, sender); - } - catch (NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException - | InvocationTargetException e) - {} + { + Module mod = ModuleLoader.getModule("Ignore"); + Method m = mod.getClass().getDeclaredMethod("_getIgnoredBy", CommandSender.class); + m.setAccessible(true); + return (BroadcastFilter) m.invoke(mod, sender); + } + catch (NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException + | InvocationTargetException e) + {} return null; } @SuppressWarnings("unused") - private BroadcastFilter _getIgnoredBy(CommandSender sender) { - return new BroadcastFilter() { + private BroadcastFilter _getIgnoredBy(CommandSender sender) + { + return new BroadcastFilter() + { - private final String sUUID = sender instanceof Player? - ((Player) sender).getUniqueId().toString() : "CONSOLE"; + private final String sUUID = sender instanceof Player ? ((Player) sender).getUniqueId().toString() + : "CONSOLE"; @Override - public boolean sendTo(CommandSender recipient) { + public boolean sendTo(CommandSender recipient) + { if (sUUID.equals("CONSOLE")) return true; @@ -150,5 +156,4 @@ public class Ignore implements Module { }; } - }