Redstoner/Modules
Archived
0
Fork 0
Code Activity

Applied formatter

Browse Source
This commit is contained in:
Pepich
2018-01-25 12:39:59 +01:00
parent f549c756ec
commit 035667e6a0
1 changed files with 62 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/com/redstoner/modules/ignore/Ignore.java
View File

@@ -24,11 +24,11 @@ import com.redstoner.modules.datamanager.DataManager;
import net.nemez.chatapi.click.Message; import net.nemez.chatapi.click.Message;
@Commands(CommandHolderType.File) @Commands(CommandHolderType.File)
@AutoRegisterListener @AutoRegisterListener
@Version(major = 4, minor = 0, revision = 0, compatible = 4) @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) @Command(hook = "unignore", async = AsyncType.ALWAYS)
public boolean unignore(CommandSender sender, String player) public boolean unignore(CommandSender sender, String player)
@@ -43,13 +43,14 @@ public class Ignore implements Module {
} }
@Command(hook = "list", async = AsyncType.ALWAYS) @Command(hook = "list", async = AsyncType.ALWAYS)
public boolean list(CommandSender sender) { public boolean list(CommandSender sender)
{
getLogger().message(sender, "§7You are currently ignoring:"); getLogger().message(sender, "§7You are currently ignoring:");
JSONArray ignores = (JSONArray) DataManager.getOrDefault(sender, "ignores", new JSONArray()); JSONArray ignores = (JSONArray) DataManager.getOrDefault(sender, "ignores", new JSONArray());
if (ignores.isEmpty())
if ( ignores.isEmpty() ) { {
new Message(sender, null).appendText(" §7Nobody \\o/").send(); new Message(sender, null).appendText(" §7Nobody \\o/").send();
return true; return true;
} }
@@ -58,7 +59,8 @@ public class Ignore implements Module {
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"; players = " §3" + pi.getName() + "§7";
for (int i = 1; i < ignores.size(); i++) { for (int i = 1; i < ignores.size(); i++)
{
OfflinePlayer p = Bukkit.getOfflinePlayer(UUID.fromString((String) ignores.get(i))); OfflinePlayer p = Bukkit.getOfflinePlayer(UUID.fromString((String) ignores.get(i)));
players += ", §3" + p.getName() + "§7"; players += ", §3" + p.getName() + "§7";
} }
@@ -74,41 +76,42 @@ public class Ignore implements Module {
{ {
JSONArray ignores = (JSONArray) DataManager.getOrDefault(sender, "ignores", new JSONArray()); JSONArray ignores = (JSONArray) DataManager.getOrDefault(sender, "ignores", new JSONArray());
Player p = Utils.isUUID(player)? Player p = Utils.isUUID(player) ? Bukkit.getPlayer(UUID.fromString(player)) : Bukkit.getPlayer(player);
Bukkit.getPlayer(UUID.fromString(player)) :
Bukkit.getPlayer(player);
OfflinePlayer op = Utils.isUUID(player)? OfflinePlayer op = Utils.isUUID(player) ? Bukkit.getOfflinePlayer(UUID.fromString(player))
Bukkit.getOfflinePlayer(UUID.fromString(player)) : : Bukkit.getOfflinePlayer(player);
Bukkit.getOfflinePlayer(player);
String pName = p != null ? p.getDisplayName() : op.getName(); String pName = p != null ? p.getDisplayName() : op.getName();
String pUUID = p != null ? p.getUniqueId().toString() : op.getUniqueId().toString(); String pUUID = p != null ? p.getUniqueId().toString() : op.getUniqueId().toString();
String sUUID = ((Player) sender).getUniqueId().toString(); String sUUID = ((Player) sender).getUniqueId().toString();
if (pUUID.equals(sUUID)) { if (pUUID.equals(sUUID))
{
getLogger().message(sender, true, "§7You can't ignore yourself :P"); getLogger().message(sender, true, "§7You can't ignore yourself :P");
return true; return true;
} }
if (ignores.contains(pUUID)) { if (ignores.contains(pUUID))
{
ignores.remove(pUUID); ignores.remove(pUUID);
getLogger().message(sender, "§7You are no longer ignoring §3" + pName + "§7."); getLogger().message(sender, "§7You are no longer ignoring §3" + pName + "§7.");
} }
else if (!allowIgnore){ else if (!allowIgnore)
{
getLogger().message(sender, "§7You weren't ignoring §3" + pName + "§7."); getLogger().message(sender, "§7You weren't ignoring §3" + pName + "§7.");
} }
else { else
{
ignores.add(pUUID); ignores.add(pUUID);
getLogger().message(sender, "§7You are now ignoring §3" + pName + "§7."); getLogger().message(sender, "§7You are now ignoring §3" + pName + "§7.");
} }
DataManager.setData(sender, "ignores", ignores); DataManager.setData(sender, "ignores", ignores);
return true; return true;
} }
public static BroadcastFilter getIgnoredBy(CommandSender sender) { public static BroadcastFilter getIgnoredBy(CommandSender sender)
{
try try
{ {
Module mod = ModuleLoader.getModule("Ignore"); Module mod = ModuleLoader.getModule("Ignore");
@@ -123,14 +126,17 @@ public class Ignore implements Module {
} }
@SuppressWarnings("unused") @SuppressWarnings("unused")
private BroadcastFilter _getIgnoredBy(CommandSender sender) { private BroadcastFilter _getIgnoredBy(CommandSender sender)
return new BroadcastFilter() { {
return new BroadcastFilter()
{
private final String sUUID = sender instanceof Player? private final String sUUID = sender instanceof Player ? ((Player) sender).getUniqueId().toString()
((Player) sender).getUniqueId().toString() : "CONSOLE"; : "CONSOLE";
@Override @Override
public boolean sendTo(CommandSender recipient) { public boolean sendTo(CommandSender recipient)
{
if (sUUID.equals("CONSOLE")) if (sUUID.equals("CONSOLE"))
return true; return true;
@@ -150,5 +156,4 @@ public class Ignore implements Module {
}; };
} }
} }