From dcb3be33a7b8a23f60b1d6eb160718878207be63 Mon Sep 17 00:00:00 2001 From: OfficialDonut Date: Wed, 15 Jan 2020 10:40:56 -0500 Subject: [PATCH 1/7] Remove explicit type arguments --- src/main/java/me/AsVaidas/LuckPemsGUI/Tools.java | 2 +- .../java/me/AsVaidas/LuckPemsGUI/groups/EditGroup.java | 8 ++++---- .../java/me/AsVaidas/LuckPemsGUI/groups/GroupsGUI.java | 2 +- src/main/java/me/AsVaidas/LuckPemsGUI/groups/Parents.java | 4 ++-- .../java/me/AsVaidas/LuckPemsGUI/groups/Permissions.java | 6 +++--- src/main/java/me/AsVaidas/LuckPemsGUI/groups/Prefix.java | 4 ++-- src/main/java/me/AsVaidas/LuckPemsGUI/groups/Suffix.java | 4 ++-- .../java/me/AsVaidas/LuckPemsGUI/tracks/EditTrack.java | 8 ++++---- .../java/me/AsVaidas/LuckPemsGUI/tracks/TracksGUI.java | 2 +- src/main/java/me/AsVaidas/LuckPemsGUI/users/EditUser.java | 8 ++++---- src/main/java/me/AsVaidas/LuckPemsGUI/users/Parents.java | 4 ++-- .../java/me/AsVaidas/LuckPemsGUI/users/Permissions.java | 6 +++--- src/main/java/me/AsVaidas/LuckPemsGUI/users/Prefix.java | 4 ++-- src/main/java/me/AsVaidas/LuckPemsGUI/users/Suffix.java | 4 ++-- src/main/java/me/AsVaidas/LuckPemsGUI/users/UsersGUI.java | 2 +- 15 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/Tools.java b/src/main/java/me/AsVaidas/LuckPemsGUI/Tools.java index a7f1692..db565c6 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/Tools.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/Tools.java @@ -43,7 +43,7 @@ public static ItemStack head(String owner, String pavadinimas, List lore } private static List ctranslate(List lore) { - List lore2 = new ArrayList(); + List lore2 = new ArrayList<>(); for (String eilute : lore) lore2.add(ChatColor.translateAlternateColorCodes('&', eilute)); return lore2; diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/EditGroup.java b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/EditGroup.java index 852620a..6231cde 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/EditGroup.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/EditGroup.java @@ -30,10 +30,10 @@ public class EditGroup implements Listener { - public static Map setWeight = new HashMap(); - public static Map setName = new HashMap(); - public static Map rename = new HashMap(); - public static Map clone = new HashMap(); + public static Map setWeight = new HashMap<>(); + public static Map setName = new HashMap<>(); + public static Map rename = new HashMap<>(); + public static Map clone = new HashMap<>(); static LuckPermsApi l = LuckPerms.getApi(); @EventHandler diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/GroupsGUI.java b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/GroupsGUI.java index ce98024..e808cc5 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/GroupsGUI.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/GroupsGUI.java @@ -28,7 +28,7 @@ public class GroupsGUI implements Listener { - List newGroup = new ArrayList(); + List newGroup = new ArrayList<>(); @EventHandler public void onGroupAdd(AsyncPlayerChatEvent e) { diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Parents.java b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Parents.java index 2b2fdd7..2a9c6ad 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Parents.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Parents.java @@ -29,8 +29,8 @@ public class Parents implements Listener { - public static Map addParent = new HashMap(); - public static Map addTempParent = new HashMap(); + public static Map addParent = new HashMap<>(); + public static Map addTempParent = new HashMap<>(); @EventHandler public void onaddParent(AsyncPlayerChatEvent e) { diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Permissions.java b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Permissions.java index 4acc354..1e089fb 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Permissions.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Permissions.java @@ -29,9 +29,9 @@ public class Permissions implements Listener { - public static Map addPermission = new HashMap(); - public static Map addTempPermission = new HashMap(); - public static Map checkIfHas = new HashMap(); + public static Map addPermission = new HashMap<>(); + public static Map addTempPermission = new HashMap<>(); + public static Map checkIfHas = new HashMap<>(); @EventHandler public void onPermissionAdd(AsyncPlayerChatEvent e) { diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Prefix.java b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Prefix.java index 3c48013..c5018f6 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Prefix.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Prefix.java @@ -29,8 +29,8 @@ public class Prefix implements Listener { - public static Map addPrefix = new HashMap(); - public static Map addTempPrefix = new HashMap(); + public static Map addPrefix = new HashMap<>(); + public static Map addTempPrefix = new HashMap<>(); @EventHandler public void onaddParent(AsyncPlayerChatEvent e) { diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Suffix.java b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Suffix.java index 0d909e9..214cea2 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Suffix.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Suffix.java @@ -29,8 +29,8 @@ public class Suffix implements Listener { - public static Map addPrefix = new HashMap(); - public static Map addTempPrefix = new HashMap(); + public static Map addPrefix = new HashMap<>(); + public static Map addTempPrefix = new HashMap<>(); @EventHandler public void onaddParent(AsyncPlayerChatEvent e) { diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/tracks/EditTrack.java b/src/main/java/me/AsVaidas/LuckPemsGUI/tracks/EditTrack.java index ed9a34e..5fc8e04 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/tracks/EditTrack.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/tracks/EditTrack.java @@ -27,10 +27,10 @@ public class EditTrack implements Listener { - public static Map addgroup = new HashMap(); - public static Map insertgroup = new HashMap(); - public static Map rename = new HashMap(); - public static Map clone = new HashMap(); + public static Map addgroup = new HashMap<>(); + public static Map insertgroup = new HashMap<>(); + public static Map rename = new HashMap<>(); + public static Map clone = new HashMap<>(); static LuckPermsApi l = LuckPerms.getApi(); @EventHandler diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/tracks/TracksGUI.java b/src/main/java/me/AsVaidas/LuckPemsGUI/tracks/TracksGUI.java index a7151a5..0f6dde1 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/tracks/TracksGUI.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/tracks/TracksGUI.java @@ -28,7 +28,7 @@ public class TracksGUI implements Listener { - List newGroup = new ArrayList(); + List newGroup = new ArrayList<>(); @EventHandler public void onGroupAdd(AsyncPlayerChatEvent e) { diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/users/EditUser.java b/src/main/java/me/AsVaidas/LuckPemsGUI/users/EditUser.java index 5748d61..ba4eb7c 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/users/EditUser.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/users/EditUser.java @@ -31,10 +31,10 @@ public class EditUser implements Listener { - public static Map primarygroup = new HashMap(); - public static Map clone = new HashMap(); - public static Map promote = new HashMap(); - public static Map demote = new HashMap(); + public static Map primarygroup = new HashMap<>(); + public static Map clone = new HashMap<>(); + public static Map promote = new HashMap<>(); + public static Map demote = new HashMap<>(); static LuckPermsApi l = LuckPerms.getApi(); diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/users/Parents.java b/src/main/java/me/AsVaidas/LuckPemsGUI/users/Parents.java index 1927f04..9a16e7b 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/users/Parents.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/users/Parents.java @@ -29,8 +29,8 @@ public class Parents implements Listener { - public static Map addParent = new HashMap(); - public static Map addTempParent = new HashMap(); + public static Map addParent = new HashMap<>(); + public static Map addTempParent = new HashMap<>(); @EventHandler public void onaddParent(AsyncPlayerChatEvent e) { diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/users/Permissions.java b/src/main/java/me/AsVaidas/LuckPemsGUI/users/Permissions.java index 6b8ce06..1e79223 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/users/Permissions.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/users/Permissions.java @@ -29,9 +29,9 @@ public class Permissions implements Listener { - public static Map addPermission = new HashMap(); - public static Map addTempPermission = new HashMap(); - public static Map checkIfHas = new HashMap(); + public static Map addPermission = new HashMap<>(); + public static Map addTempPermission = new HashMap<>(); + public static Map checkIfHas = new HashMap<>(); @EventHandler public void onPermissionAdd(AsyncPlayerChatEvent e) { diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/users/Prefix.java b/src/main/java/me/AsVaidas/LuckPemsGUI/users/Prefix.java index e4e25c2..2498d71 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/users/Prefix.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/users/Prefix.java @@ -29,8 +29,8 @@ public class Prefix implements Listener { - public static Map addPrefix = new HashMap(); - public static Map addTempPrefix = new HashMap(); + public static Map addPrefix = new HashMap<>(); + public static Map addTempPrefix = new HashMap<>(); @EventHandler public void onaddParent(AsyncPlayerChatEvent e) { diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/users/Suffix.java b/src/main/java/me/AsVaidas/LuckPemsGUI/users/Suffix.java index 4c72b17..b66f98f 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/users/Suffix.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/users/Suffix.java @@ -29,8 +29,8 @@ public class Suffix implements Listener { - public static Map addPrefix = new HashMap(); - public static Map addTempPrefix = new HashMap(); + public static Map addPrefix = new HashMap<>(); + public static Map addTempPrefix = new HashMap<>(); @EventHandler public void onaddParent(AsyncPlayerChatEvent e) { diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/users/UsersGUI.java b/src/main/java/me/AsVaidas/LuckPemsGUI/users/UsersGUI.java index 23a688e..d176231 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/users/UsersGUI.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/users/UsersGUI.java @@ -29,7 +29,7 @@ public class UsersGUI implements Listener { static LuckPermsApi l = LuckPerms.getApi(); - List editUser = new ArrayList(); + List editUser = new ArrayList<>(); @EventHandler public void onUserEdit(AsyncPlayerChatEvent e) { From a1c0d971c5067ce1cf7df5fbee8d1a1a19470dad Mon Sep 17 00:00:00 2001 From: OfficialDonut Date: Wed, 15 Jan 2020 11:08:40 -0500 Subject: [PATCH 2/7] Remove unused imports --- .../java/me/AsVaidas/LuckPemsGUI/updatechecker/JoinEvents.java | 1 - src/main/java/me/AsVaidas/LuckPemsGUI/util/OpenGUI.java | 1 - 2 files changed, 2 deletions(-) diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/updatechecker/JoinEvents.java b/src/main/java/me/AsVaidas/LuckPemsGUI/updatechecker/JoinEvents.java index ad73c2f..0361c30 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/updatechecker/JoinEvents.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/updatechecker/JoinEvents.java @@ -13,7 +13,6 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; -import sun.plugin2.main.server.Plugin; public class JoinEvents implements Listener { diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/util/OpenGUI.java b/src/main/java/me/AsVaidas/LuckPemsGUI/util/OpenGUI.java index db49bf8..245f31f 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/util/OpenGUI.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/util/OpenGUI.java @@ -11,7 +11,6 @@ import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.entity.Player; -import org.bukkit.event.Listener; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; From 6d28687b5799df30a691cfa808b6b6b9cb5db0dd Mon Sep 17 00:00:00 2001 From: OfficialDonut Date: Wed, 15 Jan 2020 11:18:56 -0500 Subject: [PATCH 3/7] Remove redundant '== true' --- src/main/java/me/AsVaidas/LuckPemsGUI/groups/Permissions.java | 2 +- .../java/me/AsVaidas/LuckPemsGUI/updatechecker/JoinEvents.java | 2 +- src/main/java/me/AsVaidas/LuckPemsGUI/users/Parents.java | 2 +- src/main/java/me/AsVaidas/LuckPemsGUI/users/Permissions.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Permissions.java b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Permissions.java index 1e089fb..66c63f1 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Permissions.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Permissions.java @@ -198,7 +198,7 @@ public void onInventoryClickEvent(InventoryClickEvent e) { if (permission.isMeta()) continue; if (permission.getPermission().contains("weight")) continue; if (sk == id) { - if (Main.plugin.getConfig().getBoolean("UseLuckPerms5.Enabled") == true) { + if (Main.plugin.getConfig().getBoolean("UseLuckPerms5.Enabled")) { if (permission.isTemporary()) Tools.sendCommand(p, "lp group " + g.getName() + " permission unsettemp " + '"' + permission.getPermission() + '"' + " " + Tools.contextConverter(permission.getFullContexts())); else diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/updatechecker/JoinEvents.java b/src/main/java/me/AsVaidas/LuckPemsGUI/updatechecker/JoinEvents.java index 0361c30..1342aea 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/updatechecker/JoinEvents.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/updatechecker/JoinEvents.java @@ -22,7 +22,7 @@ public class JoinEvents implements Listener { @EventHandler public void onJoin(final PlayerJoinEvent e) { Player p = e.getPlayer(); - if (Main.plugin.getConfig().getBoolean("Update.Enabled") == true) { + if (Main.plugin.getConfig().getBoolean("Update.Enabled")) { if (p.hasPermission("luckpermsgui.update")) { new UpdateChecker(Main.getPlugin(), 53460).getLatestVersion(version -> { if (!Main.getInstance().getDescription().getVersion().equalsIgnoreCase(version)) { diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/users/Parents.java b/src/main/java/me/AsVaidas/LuckPemsGUI/users/Parents.java index 9a16e7b..fa6e7fd 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/users/Parents.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/users/Parents.java @@ -173,7 +173,7 @@ public void onInventoryClickEvent(InventoryClickEvent e) { for (Node permission : g.getPermissions()) { if (!permission.isGroupNode()) continue; if (sk == id) { - if (Main.plugin.getConfig().getBoolean("UseLuckPerms5.Enabled") == true) { + if (Main.plugin.getConfig().getBoolean("UseLuckPerms5.Enabled")) { if (permission.isTemporary()) Tools.sendCommand(p, "lp user " + g.getName() + " parent removetemp " + '"' + permission.getPermission() + '"' + " " + Tools.contextConverter(permission.getFullContexts())); else diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/users/Permissions.java b/src/main/java/me/AsVaidas/LuckPemsGUI/users/Permissions.java index 1e79223..1b748b2 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/users/Permissions.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/users/Permissions.java @@ -195,7 +195,7 @@ public void onInventoryClickEvent(InventoryClickEvent e) { if (permission.isMeta()) continue; if (permission.getPermission().contains("weight")) continue; if (sk == id) { - if (Main.plugin.getConfig().getBoolean("UseLuckPerms5.Enabled") == true) { + if (Main.plugin.getConfig().getBoolean("UseLuckPerms5.Enabled")) { if (permission.isTemporary()) Tools.sendCommand(p, "lp user " + g.getName() + " permission unsettemp " + '"' + permission.getPermission() + '"' + " " + Tools.contextConverter(permission.getFullContexts())); else From bf52351ad951ac894da65952ee0d34c405e7149e Mon Sep 17 00:00:00 2001 From: OfficialDonut Date: Wed, 15 Jan 2020 11:24:50 -0500 Subject: [PATCH 4/7] Fix redundant int boxing --- src/main/java/me/AsVaidas/LuckPemsGUI/groups/Parents.java | 6 +++--- .../java/me/AsVaidas/LuckPemsGUI/groups/Permissions.java | 6 +++--- src/main/java/me/AsVaidas/LuckPemsGUI/groups/Prefix.java | 6 +++--- src/main/java/me/AsVaidas/LuckPemsGUI/groups/Suffix.java | 6 +++--- src/main/java/me/AsVaidas/LuckPemsGUI/users/Parents.java | 6 +++--- .../java/me/AsVaidas/LuckPemsGUI/users/Permissions.java | 6 +++--- src/main/java/me/AsVaidas/LuckPemsGUI/users/Prefix.java | 6 +++--- src/main/java/me/AsVaidas/LuckPemsGUI/users/Suffix.java | 6 +++--- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Parents.java b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Parents.java index 2a9c6ad..ed4af4a 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Parents.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Parents.java @@ -163,13 +163,13 @@ public void onInventoryClickEvent(InventoryClickEvent e) { String name = ChatColor.stripColor(item.getItemMeta().getDisplayName()); if (name.equals("Next")) { - int current = Integer.valueOf(ChatColor.stripColor(inv.getItem(53).getItemMeta().getLore().get(1).split(" ")[1])); + int current = Integer.parseInt(ChatColor.stripColor(inv.getItem(53).getItemMeta().getLore().get(1).split(" ")[1])); open(p, g, current+1); } else if (name.equals("Back")) { EditGroup.open(p, g); } else if (!name.equals("Info")) { - int id = Integer.valueOf(ChatColor.stripColor(item.getItemMeta().getLore().get(0).split(" ")[1])); + int id = Integer.parseInt(ChatColor.stripColor(item.getItemMeta().getLore().get(0).split(" ")[1])); int sk = 0; for (Node permission : g.getPermissions()) { @@ -186,7 +186,7 @@ public void onInventoryClickEvent(InventoryClickEvent e) { int current = 0; if (inv.getItem(53) != null) - current = Integer.valueOf(ChatColor.stripColor(inv.getItem(53).getItemMeta().getLore().get(1).split(" ")[1])); + current = Integer.parseInt(ChatColor.stripColor(inv.getItem(53).getItemMeta().getLore().get(1).split(" ")[1])); int page = current; Bukkit.getScheduler().runTaskLater(Main.getInstance(), () -> { diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Permissions.java b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Permissions.java index 66c63f1..5012b03 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Permissions.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Permissions.java @@ -182,13 +182,13 @@ public void onInventoryClickEvent(InventoryClickEvent e) { String name = ChatColor.stripColor(item.getItemMeta().getDisplayName()); if (name.equals("Next")) { - int current = Integer.valueOf(ChatColor.stripColor(inv.getItem(53).getItemMeta().getLore().get(1).split(" ")[1])); + int current = Integer.parseInt(ChatColor.stripColor(inv.getItem(53).getItemMeta().getLore().get(1).split(" ")[1])); open(p, g, current+1); } else if (name.equals("Back")) { EditGroup.open(p, g); } else if (!name.equals("Info")) { - int id = Integer.valueOf(ChatColor.stripColor(item.getItemMeta().getLore().get(0).split(" ")[1])); + int id = Integer.parseInt(ChatColor.stripColor(item.getItemMeta().getLore().get(0).split(" ")[1])); int sk = 0; for (Node permission : g.getPermissions()) { @@ -217,7 +217,7 @@ public void onInventoryClickEvent(InventoryClickEvent e) { int current = 0; if (inv.getItem(53) != null) - current = Integer.valueOf(ChatColor.stripColor(inv.getItem(53).getItemMeta().getLore().get(1).split(" ")[1])); + current = Integer.parseInt(ChatColor.stripColor(inv.getItem(53).getItemMeta().getLore().get(1).split(" ")[1])); int page = current; Bukkit.getScheduler().runTaskLater(Main.getInstance(), () -> { diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Prefix.java b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Prefix.java index c5018f6..d1421d6 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Prefix.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Prefix.java @@ -164,13 +164,13 @@ public void onInventoryClickEvent(InventoryClickEvent e) { String name = ChatColor.stripColor(item.getItemMeta().getDisplayName()); if (name.equals("Next")) { - int current = Integer.valueOf(ChatColor.stripColor(inv.getItem(53).getItemMeta().getLore().get(1).split(" ")[1])); + int current = Integer.parseInt(ChatColor.stripColor(inv.getItem(53).getItemMeta().getLore().get(1).split(" ")[1])); open(p, g, current+1); } else if (name.equals("Back")) { EditGroup.open(p, g); } else if (!name.equals("Info")) { - int id = Integer.valueOf(ChatColor.stripColor(item.getItemMeta().getLore().get(0).split(" ")[1])); + int id = Integer.parseInt(ChatColor.stripColor(item.getItemMeta().getLore().get(0).split(" ")[1])); int sk = 0; for (Node permission : g.getPermissions()) { @@ -187,7 +187,7 @@ public void onInventoryClickEvent(InventoryClickEvent e) { int current = 0; if (inv.getItem(53) != null) - current = Integer.valueOf(ChatColor.stripColor(inv.getItem(53).getItemMeta().getLore().get(1).split(" ")[1])); + current = Integer.parseInt(ChatColor.stripColor(inv.getItem(53).getItemMeta().getLore().get(1).split(" ")[1])); int page = current; Bukkit.getScheduler().runTaskLater(Main.getInstance(), () -> { diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Suffix.java b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Suffix.java index 214cea2..ba2d8a6 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Suffix.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Suffix.java @@ -165,13 +165,13 @@ public void onInventoryClickEvent(InventoryClickEvent e) { String name = ChatColor.stripColor(item.getItemMeta().getDisplayName()); if (name.equals("Next")) { - int current = Integer.valueOf(ChatColor.stripColor(inv.getItem(53).getItemMeta().getLore().get(1).split(" ")[1])); + int current = Integer.parseInt(ChatColor.stripColor(inv.getItem(53).getItemMeta().getLore().get(1).split(" ")[1])); open(p, g, current+1); } else if (name.equals("Back")) { EditGroup.open(p, g); } else if (!name.equals("Info")) { - int id = Integer.valueOf(ChatColor.stripColor(item.getItemMeta().getLore().get(0).split(" ")[1])); + int id = Integer.parseInt(ChatColor.stripColor(item.getItemMeta().getLore().get(0).split(" ")[1])); int sk = 0; for (Node permission : g.getPermissions()) { @@ -188,7 +188,7 @@ public void onInventoryClickEvent(InventoryClickEvent e) { int current = 0; if (inv.getItem(53) != null) - current = Integer.valueOf(ChatColor.stripColor(inv.getItem(53).getItemMeta().getLore().get(1).split(" ")[1])); + current = Integer.parseInt(ChatColor.stripColor(inv.getItem(53).getItemMeta().getLore().get(1).split(" ")[1])); int page = current; Bukkit.getScheduler().runTaskLater(Main.getInstance(), () -> { diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/users/Parents.java b/src/main/java/me/AsVaidas/LuckPemsGUI/users/Parents.java index fa6e7fd..d65e119 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/users/Parents.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/users/Parents.java @@ -161,13 +161,13 @@ public void onInventoryClickEvent(InventoryClickEvent e) { String name = ChatColor.stripColor(item.getItemMeta().getDisplayName()); if (name.equals("Next")) { - int current = Integer.valueOf(ChatColor.stripColor(inv.getItem(53).getItemMeta().getLore().get(1).split(" ")[1])); + int current = Integer.parseInt(ChatColor.stripColor(inv.getItem(53).getItemMeta().getLore().get(1).split(" ")[1])); open(p, g, current+1); } else if (name.equals("Back")) { EditUser.open(p, g); } else if (!name.equals("Info")) { - int id = Integer.valueOf(ChatColor.stripColor(item.getItemMeta().getLore().get(0).split(" ")[1])); + int id = Integer.parseInt(ChatColor.stripColor(item.getItemMeta().getLore().get(0).split(" ")[1])); int sk = 0; for (Node permission : g.getPermissions()) { @@ -192,7 +192,7 @@ public void onInventoryClickEvent(InventoryClickEvent e) { int current = 0; if (inv.getItem(53) != null) - current = Integer.valueOf(ChatColor.stripColor(inv.getItem(53).getItemMeta().getLore().get(1).split(" ")[1])); + current = Integer.parseInt(ChatColor.stripColor(inv.getItem(53).getItemMeta().getLore().get(1).split(" ")[1])); int page = current; Bukkit.getScheduler().runTaskLater(Main.getInstance(), () -> { diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/users/Permissions.java b/src/main/java/me/AsVaidas/LuckPemsGUI/users/Permissions.java index 1b748b2..e1aedbf 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/users/Permissions.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/users/Permissions.java @@ -179,13 +179,13 @@ public void onInventoryClickEvent(InventoryClickEvent e) { String name = ChatColor.stripColor(item.getItemMeta().getDisplayName()); if (name.equals("Next")) { - int current = Integer.valueOf(ChatColor.stripColor(inv.getItem(53).getItemMeta().getLore().get(1).split(" ")[1])); + int current = Integer.parseInt(ChatColor.stripColor(inv.getItem(53).getItemMeta().getLore().get(1).split(" ")[1])); open(p, g, current+1); } else if (name.equals("Back")) { EditUser.open(p, g); } else if (!name.equals("Info")) { - int id = Integer.valueOf(ChatColor.stripColor(item.getItemMeta().getLore().get(0).split(" ")[1])); + int id = Integer.parseInt(ChatColor.stripColor(item.getItemMeta().getLore().get(0).split(" ")[1])); int sk = 0; for (Node permission : g.getPermissions()) { @@ -214,7 +214,7 @@ public void onInventoryClickEvent(InventoryClickEvent e) { int current = 0; if (inv.getItem(53) != null) - current = Integer.valueOf(ChatColor.stripColor(inv.getItem(53).getItemMeta().getLore().get(1).split(" ")[1])); + current = Integer.parseInt(ChatColor.stripColor(inv.getItem(53).getItemMeta().getLore().get(1).split(" ")[1])); int page = current; Bukkit.getScheduler().runTaskLater(Main.getInstance(), () -> { diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/users/Prefix.java b/src/main/java/me/AsVaidas/LuckPemsGUI/users/Prefix.java index 2498d71..6f50644 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/users/Prefix.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/users/Prefix.java @@ -162,13 +162,13 @@ public void onInventoryClickEvent(InventoryClickEvent e) { String name = ChatColor.stripColor(item.getItemMeta().getDisplayName()); if (name.equals("Next")) { - int current = Integer.valueOf(ChatColor.stripColor(inv.getItem(53).getItemMeta().getLore().get(1).split(" ")[1])); + int current = Integer.parseInt(ChatColor.stripColor(inv.getItem(53).getItemMeta().getLore().get(1).split(" ")[1])); open(p, g, current+1); } else if (name.equals("Back")) { EditUser.open(p, g); } else if (!name.equals("Info")) { - int id = Integer.valueOf(ChatColor.stripColor(item.getItemMeta().getLore().get(0).split(" ")[1])); + int id = Integer.parseInt(ChatColor.stripColor(item.getItemMeta().getLore().get(0).split(" ")[1])); int sk = 0; for (Node permission : g.getPermissions()) { @@ -185,7 +185,7 @@ public void onInventoryClickEvent(InventoryClickEvent e) { int current = 0; if (inv.getItem(53) != null) - current = Integer.valueOf(ChatColor.stripColor(inv.getItem(53).getItemMeta().getLore().get(1).split(" ")[1])); + current = Integer.parseInt(ChatColor.stripColor(inv.getItem(53).getItemMeta().getLore().get(1).split(" ")[1])); int page = current; Bukkit.getScheduler().runTaskLater(Main.getInstance(), () -> { diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/users/Suffix.java b/src/main/java/me/AsVaidas/LuckPemsGUI/users/Suffix.java index b66f98f..9276951 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/users/Suffix.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/users/Suffix.java @@ -162,13 +162,13 @@ public void onInventoryClickEvent(InventoryClickEvent e) { String name = ChatColor.stripColor(item.getItemMeta().getDisplayName()); if (name.equals("Next")) { - int current = Integer.valueOf(ChatColor.stripColor(inv.getItem(53).getItemMeta().getLore().get(1).split(" ")[1])); + int current = Integer.parseInt(ChatColor.stripColor(inv.getItem(53).getItemMeta().getLore().get(1).split(" ")[1])); open(p, g, current+1); } else if (name.equals("Back")) { EditUser.open(p, g); } else if (!name.equals("Info")) { - int id = Integer.valueOf(ChatColor.stripColor(item.getItemMeta().getLore().get(0).split(" ")[1])); + int id = Integer.parseInt(ChatColor.stripColor(item.getItemMeta().getLore().get(0).split(" ")[1])); int sk = 0; for (Node permission : g.getPermissions()) { @@ -185,7 +185,7 @@ public void onInventoryClickEvent(InventoryClickEvent e) { int current = 0; if (inv.getItem(53) != null) - current = Integer.valueOf(ChatColor.stripColor(inv.getItem(53).getItemMeta().getLore().get(1).split(" ")[1])); + current = Integer.parseInt(ChatColor.stripColor(inv.getItem(53).getItemMeta().getLore().get(1).split(" ")[1])); int page = current; Bukkit.getScheduler().runTaskLater(Main.getInstance(), () -> { From eb5766c16e0f2abfa2d5dc68c793ac4dfd40feca Mon Sep 17 00:00:00 2001 From: OfficialDonut Date: Wed, 15 Jan 2020 11:36:59 -0500 Subject: [PATCH 5/7] Proper optional usage --- .../LuckPemsGUI/groups/EditGroup.java | 7 +---- .../AsVaidas/LuckPemsGUI/groups/Parents.java | 31 +++---------------- .../LuckPemsGUI/groups/Permissions.java | 31 +++---------------- .../AsVaidas/LuckPemsGUI/groups/Prefix.java | 31 +++---------------- .../AsVaidas/LuckPemsGUI/groups/Suffix.java | 31 +++---------------- .../AsVaidas/LuckPemsGUI/users/Parents.java | 24 ++------------ .../LuckPemsGUI/users/Permissions.java | 24 ++------------ .../me/AsVaidas/LuckPemsGUI/users/Prefix.java | 24 ++------------ .../me/AsVaidas/LuckPemsGUI/users/Suffix.java | 24 ++------------ 9 files changed, 29 insertions(+), 198 deletions(-) diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/EditGroup.java b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/EditGroup.java index 6231cde..18cf369 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/EditGroup.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/EditGroup.java @@ -98,12 +98,7 @@ public static void open(Player p, Group group) { Tools.onAsync(() -> { // ----------------------- INFO ------------------------------ - int weight = 0; - try { - weight = group.getWeight().getAsInt(); - } catch (Exception e) { - weight = 0; - } + int weight = group.getWeight().orElse(0); ItemStack info = Tools.button(Material.ARMOR_STAND, "&6Info", Arrays.asList( diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Parents.java b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Parents.java index ed4af4a..aa023e3 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Parents.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Parents.java @@ -68,12 +68,7 @@ public static void open(Player p, Group group, int page) { // ----------------------- INFO ------------------------------ - int weight = 0; - try { - weight = group.getWeight().getAsInt(); - } catch (Exception e) { - weight = 0; - } + int weight = group.getWeight().orElse(0); ItemStack info = Tools.button(Material.ARMOR_STAND, "&6Info", Arrays.asList( @@ -97,27 +92,9 @@ public static void open(Player p, Group group, int page) { for (Node permission : group.getPermissions()) { if (!permission.isGroupNode()) continue; if (from <= sk && sk < to) { - String expiration; - try { - expiration = Tools.getTime(permission.getExpiry().getTime()); - } catch (Exception e) { - expiration = "Never"; - } - - String server; - try { - server = permission.getServer().get(); - } catch (Exception e) { - server = "global"; - } - - String world; - try { - world = permission.getWorld().get(); - } catch (Exception e) { - world = "global"; - } - + String expiration = permission.isTemporary() ? Tools.getTime(permission.getExpiry().getTime()) : "Never"; + String server = permission.getServer().orElse("global"); + String world = permission.getWorld().orElse("global"); ItemStack item = Tools.button(Material.TNT, "&6"+permission.getGroupName(), Arrays.asList( diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Permissions.java b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Permissions.java index 5012b03..75e4757 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Permissions.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Permissions.java @@ -83,12 +83,7 @@ public static void open(Player p, Group group, int page) { // ----------------------- INFO ------------------------------ - int weight = 0; - try { - weight = group.getWeight().getAsInt(); - } catch (Exception e) { - weight = 0; - } + int weight = group.getWeight().orElse(0); ItemStack info = Tools.button(Material.ARMOR_STAND, "&6Info", Arrays.asList( @@ -116,27 +111,9 @@ public static void open(Player p, Group group, int page) { if (permission.isMeta()) continue; if (permission.getPermission().contains("weight")) continue; if (from <= sk && sk < to) { - String expiration; - try { - expiration = Tools.getTime(permission.getExpiry().getTime()); - } catch (Exception e) { - expiration = "Never"; - } - - String server; - try { - server = permission.getServer().get(); - } catch (Exception e) { - server = "global"; - } - - String world; - try { - world = permission.getWorld().get(); - } catch (Exception e) { - world = "global"; - } - + String expiration = permission.isTemporary() ? Tools.getTime(permission.getExpiry().getTime()) : "Never"; + String server = permission.getServer().orElse("global"); + String world = permission.getWorld().orElse("global"); ItemStack item = Tools.button(Material.TNT, "&6"+permission.getPermission(), Arrays.asList( diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Prefix.java b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Prefix.java index d1421d6..7860789 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Prefix.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Prefix.java @@ -68,12 +68,7 @@ public static void open(Player p, Group group, int page) { // ----------------------- INFO ------------------------------ - int weight = 0; - try { - weight = group.getWeight().getAsInt(); - } catch (Exception e) { - weight = 0; - } + int weight = group.getWeight().orElse(0); ItemStack info = Tools.button(Material.ARMOR_STAND, "&6Info", Arrays.asList( @@ -97,27 +92,9 @@ public static void open(Player p, Group group, int page) { for (Node permission : group.getPermissions()) { if (!permission.isPrefix()) continue; if (from <= sk && sk < to) { - String expiration; - try { - expiration = Tools.getTime(permission.getExpiry().getTime()); - } catch (Exception e) { - expiration = "Never"; - } - - String server; - try { - server = permission.getServer().get(); - } catch (Exception e) { - server = "global"; - } - - String world; - try { - world = permission.getWorld().get(); - } catch (Exception e) { - world = "global"; - } - + String expiration = permission.isTemporary() ? Tools.getTime(permission.getExpiry().getTime()) : "Never"; + String server = permission.getServer().orElse("global"); + String world = permission.getWorld().orElse("global"); ItemStack item = Tools.button(Material.TNT, "&6"+permission.getPrefix().getValue(), Arrays.asList( diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Suffix.java b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Suffix.java index ba2d8a6..64edc40 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Suffix.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Suffix.java @@ -69,12 +69,7 @@ public static void open(Player p, Group group, int page) { // ----------------------- INFO ------------------------------ - int weight = 0; - try { - weight = group.getWeight().getAsInt(); - } catch (Exception e) { - weight = 0; - } + int weight = group.getWeight().orElse(0); ItemStack info = Tools.button(Material.ARMOR_STAND, "&6Info", Arrays.asList( @@ -98,27 +93,9 @@ public static void open(Player p, Group group, int page) { for (Node permission : group.getPermissions()) { if (!permission.isSuffix()) continue; if (from <= sk && sk < to) { - String expiration; - try { - expiration = Tools.getTime(permission.getExpiry().getTime()); - } catch (Exception e) { - expiration = "Never"; - } - - String server; - try { - server = permission.getServer().get(); - } catch (Exception e) { - server = "global"; - } - - String world; - try { - world = permission.getWorld().get(); - } catch (Exception e) { - world = "global"; - } - + String expiration = permission.isTemporary() ? Tools.getTime(permission.getExpiry().getTime()) : "Never"; + String server = permission.getServer().orElse("global"); + String world = permission.getWorld().orElse("global"); ItemStack item = Tools.button(Material.TNT, "&6"+permission.getSuffix().getValue(), Arrays.asList( diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/users/Parents.java b/src/main/java/me/AsVaidas/LuckPemsGUI/users/Parents.java index d65e119..d724254 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/users/Parents.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/users/Parents.java @@ -95,27 +95,9 @@ public static void open(Player p, User user, int page) { for (Node permission : user.getPermissions()) { if (!permission.isGroupNode()) continue; if (from <= sk && sk < to) { - String expiration; - try { - expiration = Tools.getTime(permission.getExpiry().getTime()); - } catch (Exception e) { - expiration = "Never"; - } - - String server; - try { - server = permission.getServer().get(); - } catch (Exception e) { - server = "global"; - } - - String world; - try { - world = permission.getWorld().get(); - } catch (Exception e) { - world = "global"; - } - + String expiration = permission.isTemporary() ? Tools.getTime(permission.getExpiry().getTime()) : "Never"; + String server = permission.getServer().orElse("global"); + String world = permission.getWorld().orElse("global"); ItemStack item = Tools.button(Material.TNT, "&6"+permission.getGroupName(), Arrays.asList( diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/users/Permissions.java b/src/main/java/me/AsVaidas/LuckPemsGUI/users/Permissions.java index e1aedbf..d02c8cc 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/users/Permissions.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/users/Permissions.java @@ -113,27 +113,9 @@ public static void open(Player p, User user, int page) { if (permission.isMeta()) continue; if (permission.getPermission().contains("weight")) continue; if (from <= sk && sk < to) { - String expiration; - try { - expiration = Tools.getTime(permission.getExpiry().getTime()); - } catch (Exception e) { - expiration = "Never"; - } - - String server; - try { - server = permission.getServer().get(); - } catch (Exception e) { - server = "global"; - } - - String world; - try { - world = permission.getWorld().get(); - } catch (Exception e) { - world = "global"; - } - + String expiration = permission.isTemporary() ? Tools.getTime(permission.getExpiry().getTime()) : "Never"; + String server = permission.getServer().orElse("global"); + String world = permission.getWorld().orElse("global"); ItemStack item = Tools.button(Material.TNT, "&6"+permission.getPermission(), Arrays.asList( diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/users/Prefix.java b/src/main/java/me/AsVaidas/LuckPemsGUI/users/Prefix.java index 6f50644..0342efb 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/users/Prefix.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/users/Prefix.java @@ -95,27 +95,9 @@ public static void open(Player p, User user, int page) { for (Node permission : user.getPermissions()) { if (!permission.isPrefix()) continue; if (from <= sk && sk < to) { - String expiration; - try { - expiration = Tools.getTime(permission.getExpiry().getTime()); - } catch (Exception e) { - expiration = "Never"; - } - - String server; - try { - server = permission.getServer().get(); - } catch (Exception e) { - server = "global"; - } - - String world; - try { - world = permission.getWorld().get(); - } catch (Exception e) { - world = "global"; - } - + String expiration = permission.isTemporary() ? Tools.getTime(permission.getExpiry().getTime()) : "Never"; + String server = permission.getServer().orElse("global"); + String world = permission.getWorld().orElse("global"); ItemStack item = Tools.button(Material.TNT, "&6"+permission.getPrefix().getValue(), Arrays.asList( diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/users/Suffix.java b/src/main/java/me/AsVaidas/LuckPemsGUI/users/Suffix.java index 9276951..c0d5555 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/users/Suffix.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/users/Suffix.java @@ -95,27 +95,9 @@ public static void open(Player p, User user, int page) { for (Node permission : user.getPermissions()) { if (!permission.isSuffix()) continue; if (from <= sk && sk < to) { - String expiration; - try { - expiration = Tools.getTime(permission.getExpiry().getTime()); - } catch (Exception e) { - expiration = "Never"; - } - - String server; - try { - server = permission.getServer().get(); - } catch (Exception e) { - server = "global"; - } - - String world; - try { - world = permission.getWorld().get(); - } catch (Exception e) { - world = "global"; - } - + String expiration = permission.isTemporary() ? Tools.getTime(permission.getExpiry().getTime()) : "Never"; + String server = permission.getServer().orElse("global"); + String world = permission.getWorld().orElse("global"); ItemStack item = Tools.button(Material.TNT, "&6"+permission.getSuffix().getValue(), Arrays.asList( From 7ae82435e45cfb0b291de586a7091b723512418b Mon Sep 17 00:00:00 2001 From: OfficialDonut Date: Wed, 15 Jan 2020 11:51:06 -0500 Subject: [PATCH 6/7] Replace "Noodles_YT" with UUID --- src/main/java/me/AsVaidas/LuckPemsGUI/Tools.java | 6 ++++-- .../me/AsVaidas/LuckPemsGUI/updatechecker/JoinEvents.java | 2 +- src/main/java/me/AsVaidas/LuckPemsGUI/util/Settings.java | 3 +++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/Tools.java b/src/main/java/me/AsVaidas/LuckPemsGUI/Tools.java index db565c6..04598b3 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/Tools.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/Tools.java @@ -11,6 +11,8 @@ import java.util.List; import java.util.Map.Entry; import java.util.Random; + +import me.AsVaidas.LuckPemsGUI.util.Settings; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Material; @@ -60,7 +62,7 @@ public static void sendMessage(Player p, String message) { } public static void debug(String key) { - Bukkit.getPlayer("Noodles_YT").sendMessage(key); + Bukkit.getPlayer(Settings.DEVELOPER_UUID).sendMessage(key); } public static void onAsync(Runnable runnable) { @@ -68,7 +70,7 @@ public static void onAsync(Runnable runnable) { } public static void sendCommand(Player p, String command) { - if (p.getName().equals("Noodles_YT")) { + if (p.getUniqueId().equals(Settings.DEVELOPER_UUID)) { p.sendMessage(ChatColor.RED + "[DEBUG] " + command); } Bukkit.getScheduler().scheduleSyncDelayedTask(Main.getInstance(), () -> { diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/updatechecker/JoinEvents.java b/src/main/java/me/AsVaidas/LuckPemsGUI/updatechecker/JoinEvents.java index 1342aea..9e014cf 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/updatechecker/JoinEvents.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/updatechecker/JoinEvents.java @@ -41,7 +41,7 @@ public void onJoin(final PlayerJoinEvent e) { @EventHandler public void onDevJoin(PlayerJoinEvent e) { //THIS EVENT IS USED FOR DEBUG REASONS ONLY! Player p = e.getPlayer(); - if (p.getName().equals("Noodles_YT")) { + if (p.getUniqueId().equals(Settings.DEVELOPER_UUID)) { p.sendMessage(ChatColor.RED + "BGHDDevelopment Debug Message"); p.sendMessage(" "); p.sendMessage(ChatColor.GREEN + "This server is using " + Settings.NAME + " version " + Settings.VERSION); diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/util/Settings.java b/src/main/java/me/AsVaidas/LuckPemsGUI/util/Settings.java index 3ffeadb..e423fef 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/util/Settings.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/util/Settings.java @@ -6,8 +6,11 @@ package me.AsVaidas.LuckPemsGUI.util; +import java.util.UUID; + public class Settings { + public static UUID DEVELOPER_UUID = UUID.fromString("c0e4ce9d-9d0b-472c-962c-e3b0e401da4e"); public static String DEVELOPER_NAME = "BGHDDevelopment"; public static String DEVELOPER_URL = "https://bghddevelopment.com"; public static String PLUGIN_URL = "https://spigotmc.org/resources/53460"; From 7c3eab838a7aa7450c35d09c3c3acef796545e1a Mon Sep 17 00:00:00 2001 From: OfficialDonut Date: Wed, 15 Jan 2020 12:06:51 -0500 Subject: [PATCH 7/7] Improve Tools.java --- .../java/me/AsVaidas/LuckPemsGUI/Tools.java | 30 ++++++------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/Tools.java b/src/main/java/me/AsVaidas/LuckPemsGUI/Tools.java index 04598b3..ed72e12 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/Tools.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/Tools.java @@ -7,7 +7,6 @@ package me.AsVaidas.LuckPemsGUI; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.Map.Entry; import java.util.Random; @@ -32,8 +31,7 @@ public static ItemStack button(Material material, String pavadinimas, List lore, int amount) { ItemStack item = new ItemStack(Material.SKULL_ITEM, amount); SkullMeta meta = (SkullMeta) item.getItemMeta(); @@ -53,8 +51,7 @@ private static List ctranslate(List lore) { public static int randInt(int min, int max) { Random rand = new Random(); - int randomNum = rand.nextInt((max - min) + 1) + min; - return randomNum; + return rand.nextInt((max - min) + 1) + min; } public static void sendMessage(Player p, String message) { @@ -75,23 +72,17 @@ public static void sendCommand(Player p, String command) { } Bukkit.getScheduler().scheduleSyncDelayedTask(Main.getInstance(), () -> { Bukkit.dispatchCommand(p, command); - }); } public static String contextConverter(ContextSet contextSet) { - String eilute = ""; - - Iterator> set = contextSet.toMultimap().entries().iterator(); - while (set.hasNext()) { - Entry next = set.next(); - - if (eilute.equals("")) - eilute = next.getKey()+"="+next.getValue(); - else - eilute += " "+next.getKey()+"="+next.getValue(); + StringBuilder eilute = new StringBuilder(); + for (Entry entry : contextSet.toMultimap().entries()) { + if (eilute.length() != 0) + eilute.append(" "); + eilute.append(entry.getKey()).append("=").append(entry.getValue()); } - return eilute; + return eilute.toString(); } public static String getTime(long time) { @@ -111,10 +102,7 @@ public static String getTime(long time) { } public static boolean isOnline(String name) { - for (Player p : Bukkit.getOnlinePlayers()) - if (p.getName().equals(name)) - return true; - return false; + return Bukkit.getPlayerExact(name) != null; } public static void sendConsole(String string) {