Code cleanup batch 2

1 files changed, 158 insertions, 173 deletions

diff --git a/src/main/java/com/redstoner/modules/friends/Friends.java b/src/main/java/com/redstoner/modules/friends/Friends.java
index 2eb9728..b55770f 100644
--- a/src/main/java/com/redstoner/modules/friends/Friends.java
+++ b/src/main/java/com/redstoner/modules/friends/Friends.java
@@ -1,6 +1,5 @@
 package com.redstoner.modules.friends;
 
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Set;
 import java.util.UUID;
@@ -31,330 +30,316 @@ import com.redstoner.modules.datamanager.DataManager;
 @AutoRegisterListener
 @Commands(CommandHolderType.File)
 @Version(major = 4, minor = 0, revision = 0, compatible = 4)
-public class Friends implements CoreModule
-{	
+public class Friends implements CoreModule {
 	@EventHandler(priority = EventPriority.MONITOR)
-	public void onPlayerJoin(PlayerJoinEvent e)
-	{
+	public void onPlayerJoin(PlayerJoinEvent e) {
 		JSONArray friended_by = (JSONArray) DataManager.getOrDefault(e.getPlayer(), "friended_by", new JSONArray());
-		for (Object obj : friended_by)
-		{
+
+		for (Object obj : friended_by) {
 			UUID uuid = UUID.fromString((String) obj);
 			Player p = Bukkit.getPlayer(uuid);
-			if (p != null && p.canSee(e.getPlayer()))
-			{
+
+			if (p != null && p.canSee(e.getPlayer())) {
 				getLogger().message(p, "Your friend &e" + e.getPlayer().getDisplayName() + "&7 just joined!");
 				p.playSound(p.getLocation(), Sound.ENTITY_CHICKEN_EGG, 1, 1);
 			}
 		}
-		JSONArray notifications = (JSONArray) DataManager.getOrDefault(e.getPlayer(), "scheduled_notifications",
-				new JSONArray());
-		for (Object obj : notifications)
+
+		JSONArray notifications = (JSONArray) DataManager.getOrDefault(e.getPlayer(), "scheduled_notifications", new JSONArray());
+
+		for (Object obj : notifications) {
 			getLogger().message(e.getPlayer(), (String) obj);
+		}
 	}
-	
+
 	@EventHandler(priority = EventPriority.MONITOR)
-	public void onPlayerLeave(PlayerQuitEvent e)
-	{
+	public void onPlayerLeave(PlayerQuitEvent e) {
 		JSONArray friended_by = (JSONArray) DataManager.getOrDefault(e.getPlayer(), "friended_by", new JSONArray());
-		for (Object obj : friended_by)
-		{
+
+		for (Object obj : friended_by) {
 			UUID uuid = UUID.fromString((String) obj);
 			Player p = Bukkit.getPlayer(uuid);
-			if (p != null && p.canSee(e.getPlayer()))
-			{
+
+			if (p != null && p.canSee(e.getPlayer())) {
 				getLogger().message(p, "Your friend &e" + e.getPlayer().getDisplayName() + "&7 just left!");
 				p.playSound(p.getLocation(), Sound.ENTITY_CHICKEN_EGG, 1, 1);
 			}
 		}
 	}
-	
-	@SuppressWarnings({"unchecked", "deprecation"})
+
+	@SuppressWarnings({ "unchecked", "deprecation" })
 	@Command(hook = "add")
-	public boolean add(CommandSender sender, String target)
-	{
-		if (target.equalsIgnoreCase("CONSOLE"))
-		{
+	public boolean add(CommandSender sender, String target) {
+		if (target.equalsIgnoreCase("CONSOLE")) {
 			getLogger().message(sender, true, "You can't add console to your friends!");
 			return true;
 		}
+
 		OfflinePlayer p = Bukkit.getPlayer(target);
-		if (p == null)
-			p = Bukkit.getOfflinePlayer(target);
-		if (p == null)
-		{
+
+		if (p == null) p = Bukkit.getOfflinePlayer(target);
+		if (p == null) {
 			getLogger().message(sender, true, "That player couldn't be found!");
 			return true;
 		}
+
 		JSONArray friends = ((JSONArray) DataManager.getOrDefault(sender, "friends", new JSONArray()));
-		if (friends.contains(p.getUniqueId().toString()))
-		{
+
+		if (friends.contains(p.getUniqueId().toString())) {
 			getLogger().message(sender, true, "You are already friends with this person!");
 			return true;
 		}
+
 		friends.add(p.getUniqueId().toString());
 		DataManager.save(sender);
-		JSONArray friended_by = ((JSONArray) DataManager.getOrDefault(p.getUniqueId().toString(), "friended_by",
-				new JSONArray()));
+
+		JSONArray friended_by = ((JSONArray) DataManager.getOrDefault(p.getUniqueId().toString(), "friended_by", new JSONArray()));
 		friended_by.add(getID(sender));
+
 		DataManager.save(p.getUniqueId().toString());
+
 		getLogger().message(sender, "You are now friends with &e" + p.getName() + "&7!");
-		if (p instanceof Player)
-		{
+
+		if (p instanceof Player) {
 			getLogger().message((Player) p, "&e" + Utils.getName(sender) + "&7 added you as a friend!");
-		}
-		else
-		{
-			JSONArray notifications = (JSONArray) DataManager.getOrDefault(p.getUniqueId().toString(),
-					"scheduled_notifications", new JSONArray());
+		} else {
+			JSONArray notifications = (JSONArray) DataManager.getOrDefault(p.getUniqueId().toString(), "scheduled_notifications", new JSONArray());
+
 			notifications.add("&e" + Utils.getName(sender) + "&7 added you as a friend!");
 			notifications.remove("&e" + Utils.getName(sender) + "&7 removed you as a friend!");
+
 			DataManager.setData(p.getUniqueId().toString(), "scheduled_notifications", notifications);
 		}
+
 		return true;
 	}
-	
-	@SuppressWarnings({"deprecation", "unchecked"})
+
+	@SuppressWarnings({ "deprecation", "unchecked" })
 	@Command(hook = "add_grouped")
-	public boolean add_grouped(CommandSender sender, String target, String group)
-	{
-		if (target.equalsIgnoreCase("CONSOLE"))
-		{
+	public boolean add_grouped(CommandSender sender, String target, String group) {
+		if (target.equalsIgnoreCase("CONSOLE")) {
 			getLogger().message(sender, true, "You can't add console to your friends!");
 			return true;
 		}
+
 		OfflinePlayer p = Bukkit.getPlayer(target);
-		if (p == null)
-			p = Bukkit.getOfflinePlayer(target);
-		if (p == null)
-		{
+
+		if (p == null) p = Bukkit.getOfflinePlayer(target);
+		if (p == null) {
 			getLogger().message(sender, true, "That player couldn't be found!");
 			return true;
 		}
+
 		JSONArray friends = ((JSONArray) DataManager.getOrDefault(sender, "groups." + group, new JSONArray()));
-		if (friends.contains(p.getUniqueId().toString()))
-		{
+
+		if (friends.contains(p.getUniqueId().toString())) {
 			getLogger().message(sender, true, "This person already is part of that friendsgroup!");
 			return true;
 		}
+
 		friends.add(p.getUniqueId().toString());
 		DataManager.save(sender);
+
 		getLogger().message(sender, "&e" + p.getName() + "&7 is now part of the group &e" + group + "&7!");
-		if (p instanceof Player)
-		{
-			getLogger().message((Player) p,
-					"&e" + Utils.getName(sender) + " &7added you to their friendsgroup &e" + group + "&7!");
-		}
-		else
-		{
-			JSONArray notifications = (JSONArray) DataManager.getOrDefault(p.getUniqueId().toString(),
-					"scheduled_notifications", new JSONArray());
+
+		if (p instanceof Player) {
+			getLogger().message((Player) p, "&e" + Utils.getName(sender) + " &7added you to their friendsgroup &e" + group + "&7!");
+		} else {
+			JSONArray notifications = (JSONArray) DataManager.getOrDefault(p.getUniqueId().toString(), "scheduled_notifications", new JSONArray());
+
 			notifications.add("&e" + Utils.getName(sender) + " &7added you to their friendsgroup &e" + group + "&7!");
-			notifications
-					.remove("&e" + Utils.getName(sender) + " &7removed you from their friendsgroup &e" + group + "&7!");
+			notifications.remove("&e" + Utils.getName(sender) + " &7removed you from their friendsgroup &e" + group + "&7!");
+
 			DataManager.setData(p.getUniqueId().toString(), "scheduled_notifications", notifications);
 		}
+
 		return true;
 	}
-	
-	@SuppressWarnings({"deprecation", "unchecked"})
+
+	@SuppressWarnings({ "deprecation", "unchecked" })
 	@Command(hook = "del")
-	public boolean del(CommandSender sender, String target)
-	{
-		if (target.equalsIgnoreCase("CONSOLE"))
-		{
+	public boolean del(CommandSender sender, String target) {
+		if (target.equalsIgnoreCase("CONSOLE")) {
 			getLogger().message(sender, true, "You can't add console to your friends!");
 			return true;
 		}
+
 		OfflinePlayer p = Bukkit.getPlayer(target);
-		if (p == null)
-			p = Bukkit.getOfflinePlayer(target);
-		if (p == null)
-		{
+
+		if (p == null) p = Bukkit.getOfflinePlayer(target);
+		if (p == null) {
 			getLogger().message(sender, true, "That player couldn't be found!");
 			return true;
 		}
+
 		JSONArray friends = ((JSONArray) DataManager.getOrDefault(sender, "friends", new JSONArray()));
-		if (friends.contains(p.getUniqueId().toString()))
-		{
+
+		if (friends.contains(p.getUniqueId().toString())) {
 			getLogger().message(sender, true, "You are already friends with this person!");
 			return true;
 		}
+
 		friends.remove(p.getUniqueId().toString());
 		DataManager.save(sender);
-		JSONArray friended_by = ((JSONArray) DataManager.getOrDefault(p.getUniqueId().toString(), "friended_by",
-				new JSONArray()));
+
+		JSONArray friended_by = ((JSONArray) DataManager.getOrDefault(p.getUniqueId().toString(), "friended_by", new JSONArray()));
 		friended_by.remove(getID(sender));
+
 		DataManager.save(p.getUniqueId().toString());
+
 		getLogger().message(sender, "You are now friends with &e" + p.getName() + "&7!");
-		if (p instanceof Player)
-		{
+
+		if (p instanceof Player) {
 			getLogger().message((Player) p, "&e" + Utils.getName(sender) + "&7 added you as a friend!");
-		}
-		else
-		{
-			JSONArray notifications = (JSONArray) DataManager.getOrDefault(p.getUniqueId().toString(),
-					"scheduled_notifications", new JSONArray());
+		} else {
+			JSONArray notifications = (JSONArray) DataManager.getOrDefault(p.getUniqueId().toString(), "scheduled_notifications", new JSONArray());
+
 			notifications.add("&e" + Utils.getName(sender) + "&7 removed you as a friend!");
 			notifications.remove("&e" + Utils.getName(sender) + "&7 added you as a friend!");
+
 			DataManager.setData(p.getUniqueId().toString(), "scheduled_notifications", notifications);
 		}
+
 		return true;
 	}
-	
-	@SuppressWarnings({"deprecation", "unchecked"})
+
+	@SuppressWarnings({ "deprecation", "unchecked" })
 	@Command(hook = "del_grouped")
-	public boolean del_grouped(CommandSender sender, String target, String group)
-	{
-		if (target.equalsIgnoreCase("CONSOLE"))
-		{
+	public boolean del_grouped(CommandSender sender, String target, String group) {
+		if (target.equalsIgnoreCase("CONSOLE")) {
 			getLogger().message(sender, true, "You can't add console to your friends!");
 			return true;
 		}
+
 		OfflinePlayer p = Bukkit.getPlayer(target);
-		if (p == null)
-			p = Bukkit.getOfflinePlayer(target);
-		if (p == null)
-		{
+
+		if (p == null) p = Bukkit.getOfflinePlayer(target);
+		if (p == null) {
 			getLogger().message(sender, true, "That player couldn't be found!");
 			return true;
 		}
+
 		JSONArray friends = ((JSONArray) DataManager.getOrDefault(sender, "groups." + group, new JSONArray()));
-		if (friends.contains(p.getUniqueId().toString()))
-		{
+
+		if (friends.contains(p.getUniqueId().toString())) {
 			getLogger().message(sender, true, "This person already is part of that friendsgroup!");
 			return true;
 		}
+
 		friends.add(p.getUniqueId().toString());
 		DataManager.save(sender);
+
 		getLogger().message(sender, "&e" + p.getName() + "&7 is now part of the group &e" + group + "&7!");
-		if (p instanceof Player)
-		{
-			getLogger().message((Player) p,
-					"&e" + Utils.getName(sender) + " &7added you to their friendsgroup &e" + group + "&7!");
-		}
-		else
-		{
-			JSONArray notifications = (JSONArray) DataManager.getOrDefault(p.getUniqueId().toString(),
-					"scheduled_notifications", new JSONArray());
-			notifications
-					.add("&e" + Utils.getName(sender) + " &7removed you from their friendsgroup &e" + group + "&7!");
-			notifications
-					.remove("&e" + Utils.getName(sender) + " &7added you to their friendsgroup &e" + group + "&7!");
+
+		if (p instanceof Player) {
+			getLogger().message((Player) p, "&e" + Utils.getName(sender) + " &7added you to their friendsgroup &e" + group + "&7!");
+		} else {
+			JSONArray notifications = (JSONArray) DataManager.getOrDefault(p.getUniqueId().toString(), "scheduled_notifications", new JSONArray());
+
+			notifications.add("&e" + Utils.getName(sender) + " &7removed you from their friendsgroup &e" + group + "&7!");
+			notifications.remove("&e" + Utils.getName(sender) + " &7added you to their friendsgroup &e" + group + "&7!");
+
 			DataManager.setData(p.getUniqueId().toString(), "scheduled_notifications", notifications);
 		}
+
 		return true;
 	}
-	
+
 	@Command(hook = "list")
-	public boolean list(CommandSender sender)
-	{
+	public boolean list(CommandSender sender) {
 		JSONArray friends = (JSONArray) DataManager.getOrDefault(sender, "friends", new JSONArray());
-		if (friends.size() == 0)
-		{
+
+		if (friends.size() == 0) {
 			getLogger().message(sender, true, "You didn't add anyone to your friendslist yet.");
-		}
-		else
-		{
+		} else {
 			StringBuilder sb = new StringBuilder();
-			for (Object o : friends.toArray())
-			{
+
+			for (Object o : friends.toArray()) {
 				UUID id = UUID.fromString((String) o);
 				Player p = Bukkit.getPlayer(id);
-				if (p != null)
-					sb.append(p.getDisplayName() + "&7, ");
-				else
-					sb.append("&9" + Bukkit.getOfflinePlayer(id).getName() + "&7, ");
+
+				if (p != null) sb.append(p.getDisplayName() + "&7, ");
+				else sb.append("&9" + Bukkit.getOfflinePlayer(id).getName() + "&7, ");
 			}
+
 			String out = sb.toString().replaceAll(", $", "");
 			getLogger().message(sender, "You have a total of &e" + friends.size() + "&7 friends:", out);
 		}
+
 		return true;
 	}
-	
+
 	@Command(hook = "list_group")
-	public boolean list_group(CommandSender sender, String group)
-	{
+	public boolean list_group(CommandSender sender, String group) {
 		JSONArray friends = (JSONArray) DataManager.getOrDefault(sender, "group." + group, new JSONArray());
-		if (friends.size() == 0)
-		{
+
+		if (friends.size() == 0) {
 			getLogger().message(sender, true, "You didn't add anyone to this group yet.");
-		}
-		else
-		{
+		} else {
 			StringBuilder sb = new StringBuilder();
-			for (Object o : friends.toArray())
-			{
+
+			for (Object o : friends.toArray()) {
 				UUID id = UUID.fromString((String) o);
 				Player p = Bukkit.getPlayer(id);
-				if (p != null)
-					sb.append(p.getDisplayName() + "&7, ");
-				else
-					sb.append("&9" + Bukkit.getOfflinePlayer(id).getName() + "&7, ");
+
+				if (p != null) sb.append(p.getDisplayName() + "&7, ");
+				else sb.append("&9" + Bukkit.getOfflinePlayer(id).getName() + "&7, ");
 			}
+
 			String out = sb.toString().replaceAll(", $", "");
 			getLogger().message(sender, "You have a total of &e" + friends.size() + "&7 friends added to this group:", out);
 		}
+
 		return true;
 	}
-	
+
 	@Command(hook = "list_groups")
-	public boolean list_groups(CommandSender sender)
-	{
+	public boolean list_groups(CommandSender sender) {
 		JSONObject raw = (JSONObject) DataManager.getOrDefault(sender, null, new JSONObject());
 		Set<?> keys = raw.keySet();
-		if (keys.size() == 0 || (keys.contains("friends") && keys.size() == 1))
-		{
+
+		if (keys.size() == 0 || (keys.contains("friends") && keys.size() == 1)) {
 			getLogger().message(sender, true, "You don't have any custom groups made yet.");
 			return true;
-		}
-		else
-		{
+		} else {
 			StringBuilder sb = new StringBuilder();
-			for (Object o : keys)
-			{
+
+			for (Object o : keys) {
 				sb.append("&e" + (String) o + "&7, ");
 			}
+
 			String out = sb.toString().replaceAll(", $", "");
 			getLogger().message(sender, "", out);
 		}
+
 		return true;
 	}
-	
-	public static boolean isFriend(CommandSender player, CommandSender friend)
-	{
+
+	public static boolean isFriend(CommandSender player, CommandSender friend) {
 		return isFriend(player, friend, null);
 	}
-	
-	public static boolean isFriend(CommandSender player, CommandSender friend, String condition)
-	{
-		try
-		{
+
+	public static boolean isFriend(CommandSender player, CommandSender friend, String condition) {
+		try {
 			Module mod = ModuleLoader.getModule("Friends");
 			Method m = mod.getClass().getDeclaredMethod("isFriend_", String.class);
+
 			return (boolean) m.invoke(mod, player, friend, condition);
+		} catch (Exception e) {
+			return false;
 		}
-		catch (NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException
-				| InvocationTargetException e)
-		{}
-		return false;
 	}
-	
-	protected boolean isFriend_(CommandSender player, CommandSender friend, String group)
-	{
-		if (group == null)
-			group = "friends";
-		else if (!group.startsWith("group."))
-			group = "group." + group;
+
+	protected boolean isFriend_(CommandSender player, CommandSender friend, String group) {
+		if (group == null) group = "friends";
+		else if (!group.startsWith("group.")) group = "group." + group;
+
 		JSONArray array = (JSONArray) DataManager.getOrDefault(player, group, new JSONArray());
 		return array.contains(getID(friend));
 	}
-	
-	private final String getID(CommandSender sender)
-	{
-		if (sender instanceof Player)
-			return ((Player) sender).getUniqueId().toString();
-		else
-			return sender.getName();
+
+	private final String getID(CommandSender sender) {
+		if (sender instanceof Player) return ((Player) sender).getUniqueId().toString();
+		else return sender.getName();
 	}
 }