diff --git a/.gitignore b/.gitignore index 4b6f3bf4..8c554caa 100644 --- a/.gitignore +++ b/.gitignore @@ -164,3 +164,7 @@ release.properties dependency-reduced-pom.xml buildNumber.properties .mvn/timing.properties + +.idea/ + +*.iml diff --git a/namelayer-all/pom.xml b/namelayer-all/pom.xml index b7808c62..eb14b712 100644 --- a/namelayer-all/pom.xml +++ b/namelayer-all/pom.xml @@ -12,7 +12,7 @@ NameLayer - 2.12.0 + 2.13.0 diff --git a/namelayer-spigot/pom.xml b/namelayer-spigot/pom.xml index ec96d758..eabebab7 100644 --- a/namelayer-spigot/pom.xml +++ b/namelayer-spigot/pom.xml @@ -17,7 +17,7 @@ vg.civcraft.mc.namelayer - namelayer-nms-v1_13_R2 + namelayer-nms-v1_14_R1 1.0.1 @@ -25,13 +25,13 @@ org.spigotmc spigot-api - 1.13.2-R0.1-SNAPSHOT + 1.14.4-R0.1-SNAPSHOT provided vg.civcraft.mc.civmodcore CivModCore - 1.7.0 + 1.7.5 provided @@ -121,6 +121,16 @@ namelayer-nms-v1_12_R1 1.0.1 + + vg.civcraft.mc.namelayer + namelayer-nms-v1_13_R2 + 1.0.1 + + + vg.civcraft.mc.namelayer + namelayer-nms-v1_14_R1 + 1.0.1 + diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/GroupManager.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/GroupManager.java index ef88f87d..a13bba9a 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/GroupManager.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/GroupManager.java @@ -1,12 +1,9 @@ package vg.civcraft.mc.namelayer; -import java.sql.Timestamp; import java.util.ArrayList; import java.util.HashMap; -import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; @@ -32,8 +29,8 @@ public class GroupManager{ private static GroupManagerDao groupManagerDao; private PermissionHandler permhandle; - private static Map groupsByName = new ConcurrentHashMap(); - private static Map groupsById = new ConcurrentHashMap(); + private static Map groupsByName = new ConcurrentHashMap<>(); + private static Map groupsById = new ConcurrentHashMap<>(); public GroupManager(){ groupManagerDao = NameLayerPlugin.getGroupManagerDao(); @@ -42,7 +39,8 @@ public GroupManager(){ /** * Saves the group into caching and saves it into the db. Also fires the GroupCreateEvent. - * @param The group to create to db. + * @param group the group to create to db. + * @return the internal ID of the group created. */ public int createGroup(Group group){ return createGroup(group,true); @@ -232,6 +230,9 @@ public void transferGroup(Group g, UUID uuid, boolean savetodb){ * _for now_ simply invalidating the cache on servers. * * Eventually, we'll need to go line-by-line through the db code and just replicate in cache. That day is not today. + * + * @param group the origin group + * @param toMerge the group to merge in */ public void doneMergeGroup(Group group, Group toMerge) { if (group == null || toMerge == null) { @@ -410,6 +411,9 @@ public static Group getSpecialCircumstanceGroup(String name){ /** * DO NOT WORK WITH THE PERMISSION OBJECT ITSELF TO DETERMINE ACCESS. Use the methods provided in this class instead, as they * respect all the permission inheritation stuff + * + * @param group the group to retrieve permissions from + * @return the actual permissions for this object or null */ public GroupPermission getPermissionforGroup(Group group){ if (group == null) { @@ -432,7 +436,7 @@ public boolean hasAccess(Group group, UUID player, PermissionType perm) { if (p != null && (p.isOp() || p.hasPermission("namelayer.admin"))) { return true; } - if (group == null || player == null || perm == null) { + if (group == null || perm == null) { NameLayerPlugin.getInstance().getLogger().log(Level.INFO, "hasAccess failed, caller passed in null", new Exception()); return false; } @@ -443,26 +447,25 @@ public boolean hasAccess(Group group, UUID player, PermissionType perm) { return false; } } - GroupPermission perms = getPermissionforGroup(group); - for(PlayerType rank : getRecursivePlayerTypes(group, player)) { - if (perms.hasPermission(rank, perm)) { - //player has right rank in the group itself or at least one super group + return hasPlayerInheritsPerms(group, player, perm); + } + + /** + * Checks if a player has a permission in a group or one of its parent groups + * @param group the group, and its parents etc to check + * @param player the player + * @param perm the permission to check + * @return if the player has the specified permission in a group or one of its parents + */ + private boolean hasPlayerInheritsPerms(Group group, UUID player, PermissionType perm) { + while (group != null) { + PlayerType type = group.getPlayerType(player); + if (type != null && getPermissionforGroup(group).hasPermission(type, perm)) { return true; } - } - return false; - } - - private List getRecursivePlayerTypes(Group group, UUID player) { - List perms = new LinkedList(); - PlayerType type = group.getPlayerType(player); - if (type != null) { - perms.add(type); + group = group.getSuperGroup(); } - if (group.hasSuperGroup()) { - perms.addAll(getRecursivePlayerTypes(group.getSuperGroup(), player)); - } - return perms; + return false; } // == PERMISSION HANDLING ============================================================= // @@ -478,7 +481,7 @@ private void deleteGroupPerms(Group group){ public List getAllGroupNames(UUID uuid){ if (uuid == null) { NameLayerPlugin.getInstance().getLogger().log(Level.INFO, "getAllGroupNames failed, caller passed in null", new Exception()); - return new ArrayList(); + return new ArrayList<>(); } return groupManagerDao.getGroupNames(uuid); } @@ -491,11 +494,7 @@ private void initiateDefaultPerms(Integer groupId){ Map > defaultPermMapping = new HashMap>(); for(PermissionType perm : PermissionType.getAllPermissions()) { for(PlayerType type : perm.getDefaultPermLevels()) { - List perms = defaultPermMapping.get(type); - if (perms == null) { - perms = new LinkedList(); - defaultPermMapping.put(type, perms); - } + List perms = defaultPermMapping.computeIfAbsent(type, k -> new ArrayList<>()); perms.add(perm); } } @@ -512,7 +511,7 @@ public String getDefaultGroup(UUID uuid){ /** * Invalidates a group from cache. - * @param group + * @param group the group to invalidate cache for */ public static void invalidateCache(String group){ if (group == null) { diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/NameLayerPlugin.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/NameLayerPlugin.java index cb794929..a37cb373 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/NameLayerPlugin.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/NameLayerPlugin.java @@ -67,12 +67,6 @@ public void onEnable() { } } - // Calling this for ACivMod - @Override - public void onLoad(){ - super.onLoad(); - } - public void registerListeners(){ getServer().getPluginManager().registerEvents(new AssociationListener(), this); getServer().getPluginManager().registerEvents(new PlayerListener(), this); @@ -215,26 +209,6 @@ else if (level == Level.SEVERE) message + "\n --------------------------------------"); } - /** - * Updates the version number for a plugin. You must specify what - * the current version number is. - * @param currentVersion- The current version of the plugin. - * @param pluginName- The plugin name. - * @return Returns the new version of the db. - */ - @Deprecated - public static void insertVersionNum(int currentVersion, String pluginName){ - throw new UnsupportedOperationException("insertVersionNum is no longer supported. Extend CivModCore and use ManagedDatasource"); - } - /** - * Checks the version of a specific plugin's db. - * @param name- The name of the plugin. - * @return Returns the version of the plugin or 0 if none was found. - */ - @Deprecated - public static int getVersionNum(String pluginName){ - throw new UnsupportedOperationException("getVersionNum is no longer supported. Extend CivModCore and use ManagedDatasource"); - } public static String getSpecialAdminGroup(){ return "Name_Layer_Special"; @@ -244,11 +218,6 @@ public static boolean createGroupOnFirstJoin() { return createGroupOnFirstJoin; } - @Override - protected String getPluginName() { - return "NameLayerPlugin"; - } - public int getGroupLimit(){ return groupLimit; } diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/CommandHandler.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/CommandHandler.java index 50bec952..4cd0585b 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/CommandHandler.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/CommandHandler.java @@ -10,48 +10,42 @@ import vg.civcraft.mc.civmodcore.command.Command; import vg.civcraft.mc.namelayer.command.commands.AcceptInvite; import vg.civcraft.mc.namelayer.command.commands.AddBlacklist; -import vg.civcraft.mc.namelayer.command.commands.LinkGroups; import vg.civcraft.mc.namelayer.command.commands.ChangePlayerName; import vg.civcraft.mc.namelayer.command.commands.CreateGroup; import vg.civcraft.mc.namelayer.command.commands.DeleteGroup; import vg.civcraft.mc.namelayer.command.commands.DisciplineGroup; +import vg.civcraft.mc.namelayer.command.commands.GetDefaultGroup; import vg.civcraft.mc.namelayer.command.commands.GlobalStats; import vg.civcraft.mc.namelayer.command.commands.GroupStats; import vg.civcraft.mc.namelayer.command.commands.InfoDump; import vg.civcraft.mc.namelayer.command.commands.InvitePlayer; import vg.civcraft.mc.namelayer.command.commands.JoinGroup; import vg.civcraft.mc.namelayer.command.commands.LeaveGroup; -import vg.civcraft.mc.namelayer.command.commands.NameLayerGroupGui; -import vg.civcraft.mc.namelayer.command.commands.ShowBlacklist; import vg.civcraft.mc.namelayer.command.commands.ListCurrentInvites; import vg.civcraft.mc.namelayer.command.commands.ListGroups; import vg.civcraft.mc.namelayer.command.commands.ListMembers; import vg.civcraft.mc.namelayer.command.commands.ListPermissions; import vg.civcraft.mc.namelayer.command.commands.ListPlayerTypes; -import vg.civcraft.mc.namelayer.command.commands.ListSubGroups; import vg.civcraft.mc.namelayer.command.commands.MergeGroups; import vg.civcraft.mc.namelayer.command.commands.ModifyPermissions; +import vg.civcraft.mc.namelayer.command.commands.NameLayerGroupGui; +import vg.civcraft.mc.namelayer.command.commands.PromotePlayer; +import vg.civcraft.mc.namelayer.command.commands.RejectInvite; import vg.civcraft.mc.namelayer.command.commands.RemoveBlacklist; import vg.civcraft.mc.namelayer.command.commands.RemoveMember; -import vg.civcraft.mc.namelayer.command.commands.UnlinkGroups; +import vg.civcraft.mc.namelayer.command.commands.RevokeInvite; +import vg.civcraft.mc.namelayer.command.commands.SetDefaultGroup; import vg.civcraft.mc.namelayer.command.commands.SetPassword; +import vg.civcraft.mc.namelayer.command.commands.ShowBlacklist; import vg.civcraft.mc.namelayer.command.commands.ToggleAutoAcceptInvites; import vg.civcraft.mc.namelayer.command.commands.TransferGroup; -import vg.civcraft.mc.namelayer.command.commands.PromotePlayer; -import vg.civcraft.mc.namelayer.command.commands.RejectInvite; -import vg.civcraft.mc.namelayer.command.commands.RevokeInvite; -import vg.civcraft.mc.namelayer.command.commands.SetDefaultGroup; -import vg.civcraft.mc.namelayer.command.commands.GetDefaultGroup; import vg.civcraft.mc.namelayer.command.commands.UpdateName; public class CommandHandler { - public Map commands = new HashMap(); + private Map commands = new HashMap<>(); public void registerCommands(){ addCommands(new AcceptInvite("AcceptInvite")); - //addCommands(new LinkGroups("LinkGroups")); - //addCommands(new UnlinkGroups("UnlinkGroups")); - //addCommands(new ListSubGroups("ListSubGroups")); addCommands(new CreateGroup("CreateGroup")); addCommands(new DeleteGroup("DeleteGroup")); addCommands(new DisciplineGroup("DisiplineGroup")); diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/TabCompleters/GroupTabCompleter.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/TabCompleters/GroupTabCompleter.java index 5bc10fda..1ee8622d 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/TabCompleters/GroupTabCompleter.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/TabCompleters/GroupTabCompleter.java @@ -1,12 +1,17 @@ package vg.civcraft.mc.namelayer.command.TabCompleters; +import java.util.LinkedList; +import java.util.List; +import java.util.UUID; + import org.bukkit.entity.Player; + import vg.civcraft.mc.namelayer.GroupManager; import vg.civcraft.mc.namelayer.NameAPI; import vg.civcraft.mc.namelayer.group.Group; import vg.civcraft.mc.namelayer.permission.PermissionType; -import java.util.LinkedList; +import java.util.ArrayList; import java.util.List; import java.util.UUID; @@ -18,30 +23,31 @@ public static List complete(String lastArg, PermissionType accessLevel, UUID uuid = NameAPI.getUUID(sender.getName()); GroupManager gm = NameAPI.getGroupManager(); List groups = gm.getAllGroupNames(uuid); - List fitting_groups = new LinkedList<>(); - List result = new LinkedList<>(); + List fittingGroups = new ArrayList<>(); + List result = new ArrayList<>(); if (lastArg != null){ for (String group : groups){ if (group.toLowerCase().startsWith(lastArg.toLowerCase())){ - fitting_groups.add(group); - } else { + fittingGroups.add(group); } - } + } } else { - fitting_groups = groups; + fittingGroups = groups; } if (accessLevel == null) { - for (String group_name: fitting_groups){ - Group group = gm.getGroup(group_name); - if (group.isMember(uuid)) - result.add(group_name); + for (String groupName : fittingGroups){ + Group group = GroupManager.getGroup(groupName); + if (group != null && group.isMember(uuid)) { + result.add(groupName); + } } } else { - for (String group_name : fitting_groups) { - if (gm.hasAccess(group_name, uuid, accessLevel)) - result.add(group_name); + for (String groupName : fittingGroups) { + if (gm.hasAccess(groupName, uuid, accessLevel)) { + result.add(groupName); + } } } return result; diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/TabCompleters/InviteTabCompleter.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/TabCompleters/InviteTabCompleter.java index 11ef8656..b2078a2a 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/TabCompleters/InviteTabCompleter.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/TabCompleters/InviteTabCompleter.java @@ -1,35 +1,38 @@ package vg.civcraft.mc.namelayer.command.TabCompleters; import org.bukkit.entity.Player; -import vg.civcraft.mc.namelayer.GroupManager; +import org.bukkit.util.StringUtil; import vg.civcraft.mc.namelayer.NameAPI; import vg.civcraft.mc.namelayer.group.Group; import vg.civcraft.mc.namelayer.listeners.PlayerListener; -import vg.civcraft.mc.namelayer.permission.PermissionType; import java.util.ArrayList; -import java.util.LinkedList; +import java.util.Collections; import java.util.List; import java.util.UUID; +import java.util.stream.Collectors; + +import org.bukkit.entity.Player; + +import vg.civcraft.mc.namelayer.NameAPI; +import vg.civcraft.mc.namelayer.group.Group; +import vg.civcraft.mc.namelayer.listeners.PlayerListener; /** * Created by isaac on 2/2/2015. */ public class InviteTabCompleter { - public static List complete(String lastArg, Player sender) { - UUID uuid = NameAPI.getUUID(sender.getName()); - List groups = PlayerListener.getNotifications(uuid); - List result = new LinkedList<>(); - - if (groups == null) - return new ArrayList<>(); - - for (Group group : groups){ - if (lastArg == null || group.getName().toLowerCase().startsWith(lastArg.toLowerCase())){ - result.add(group.getName()); - } - } + public static List complete(String lastArg, Player sender) { + UUID uuid = NameAPI.getUUID(sender.getName()); + List groups = PlayerListener.getNotifications(uuid); + if (groups == null) { + return Collections.emptyList(); + } + List groupsString = groups.stream().map(Group::getName).collect(Collectors.toList()); + if (lastArg == null) { + return groupsString; + } - return result; - } + return StringUtil.copyPartialMatches(lastArg, groupsString, new ArrayList<>()); + } } diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/TabCompleters/MemberTypeCompleter.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/TabCompleters/MemberTypeCompleter.java index 52c40cd4..b28c93eb 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/TabCompleters/MemberTypeCompleter.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/TabCompleters/MemberTypeCompleter.java @@ -1,36 +1,30 @@ package vg.civcraft.mc.namelayer.command.TabCompleters; +import org.bukkit.util.StringUtil; import vg.civcraft.mc.namelayer.GroupManager; -import java.util.LinkedList; +import java.util.ArrayList; import java.util.List; +import vg.civcraft.mc.namelayer.GroupManager; + /** * Created by isaac on 2/2/2015. * * Used by tab completers to get a list of user types */ public class MemberTypeCompleter { - - public static List complete(String lastArg) { GroupManager.PlayerType[] types = GroupManager.PlayerType.values(); - List type_strings = new LinkedList<>(); - List result = new LinkedList<>(); - - for (GroupManager.PlayerType type: types){ - type_strings.add(type.toString()); + List typeStrings = new ArrayList<>(types.length); + for (GroupManager.PlayerType type : types){ + typeStrings.add(type.toString()); } - if (lastArg != null) { - for(String type: type_strings){ - if (type.toLowerCase().startsWith(lastArg.toLowerCase())) - result.add(type); - } - } else { - result = type_strings; + if (lastArg == null) { + return typeStrings; } - return result; + return StringUtil.copyPartialMatches(lastArg, typeStrings, new ArrayList<>()); } } diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/TabCompleters/PermissionCompleter.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/TabCompleters/PermissionCompleter.java index 3f2ff1cf..8ef57997 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/TabCompleters/PermissionCompleter.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/TabCompleters/PermissionCompleter.java @@ -1,35 +1,30 @@ package vg.civcraft.mc.namelayer.command.TabCompleters; +import org.bukkit.util.StringUtil; import vg.civcraft.mc.namelayer.permission.PermissionType; -import java.util.LinkedList; +import java.util.ArrayList; import java.util.List; +import vg.civcraft.mc.namelayer.permission.PermissionType; + /** * Created by isaac on 2/2/2015. * * Used by tab completers to get a list of user types */ public class PermissionCompleter { - - public static List complete(String lastArg) { - List type_strings = new LinkedList<>(); - List result = new LinkedList<>(); + List typeStrings = new ArrayList<>(); - for (PermissionType type: PermissionType.getAllPermissions()){ - type_strings.add(type.getName()); + for (PermissionType type : PermissionType.getAllPermissions()) { + typeStrings.add(type.getName()); } - if (lastArg != null) { - for(String type: type_strings){ - if (type.toLowerCase().startsWith(lastArg.toLowerCase())) - result.add(type); - } + if (lastArg == null) { + return typeStrings; } else { - result = type_strings; + return StringUtil.copyPartialMatches(lastArg, typeStrings, new ArrayList<>()); } - - return result; } } diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/AddBlacklist.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/AddBlacklist.java index 45cc242c..4f3af24e 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/AddBlacklist.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/AddBlacklist.java @@ -2,7 +2,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Set; import java.util.UUID; import org.bukkit.Bukkit; diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/ChangePlayerName.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/ChangePlayerName.java index 03df16b1..25c1f22b 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/ChangePlayerName.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/ChangePlayerName.java @@ -1,14 +1,13 @@ package vg.civcraft.mc.namelayer.command.commands; -import org.bukkit.Bukkit; +import java.util.List; +import java.util.UUID; + import org.bukkit.command.CommandSender; import vg.civcraft.mc.namelayer.NameAPI; import vg.civcraft.mc.namelayer.command.PlayerCommandMiddle; -import java.util.List; -import java.util.UUID; - /** * Created by isaac on 2/6/15. */ diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/DeleteGroup.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/DeleteGroup.java index fe5238d7..69c4eb67 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/DeleteGroup.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/DeleteGroup.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.Map; import java.util.UUID; + import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -14,7 +15,6 @@ import vg.civcraft.mc.namelayer.command.PlayerCommandMiddle; import vg.civcraft.mc.namelayer.command.TabCompleters.GroupTabCompleter; import vg.civcraft.mc.namelayer.group.Group; -import vg.civcraft.mc.namelayer.permission.GroupPermission; import vg.civcraft.mc.namelayer.permission.PermissionType; public class DeleteGroup extends PlayerCommandMiddle{ diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/DisciplineGroup.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/DisciplineGroup.java index 2091b7a9..82f77038 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/DisciplineGroup.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/DisciplineGroup.java @@ -1,5 +1,7 @@ package vg.civcraft.mc.namelayer.command.commands; +import java.util.List; + import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -7,8 +9,6 @@ import vg.civcraft.mc.namelayer.command.PlayerCommandMiddle; import vg.civcraft.mc.namelayer.group.Group; -import java.util.List; - public class DisciplineGroup extends PlayerCommandMiddle{ public DisciplineGroup(String name) { diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/GlobalStats.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/GlobalStats.java index d4e0bb46..ee66e609 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/GlobalStats.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/GlobalStats.java @@ -1,5 +1,7 @@ package vg.civcraft.mc.namelayer.command.commands; +import java.util.List; + import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; @@ -7,8 +9,6 @@ import vg.civcraft.mc.namelayer.NameLayerPlugin; import vg.civcraft.mc.namelayer.command.PlayerCommandMiddle; -import java.util.List; - public class GlobalStats extends PlayerCommandMiddle{ public GlobalStats(String name) { diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/GroupStats.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/GroupStats.java index 0115b7cf..5d1d7c8e 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/GroupStats.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/GroupStats.java @@ -14,7 +14,6 @@ import vg.civcraft.mc.namelayer.command.PlayerCommandMiddle; import vg.civcraft.mc.namelayer.command.TabCompleters.GroupTabCompleter; import vg.civcraft.mc.namelayer.group.Group; -import vg.civcraft.mc.namelayer.permission.GroupPermission; import vg.civcraft.mc.namelayer.permission.PermissionType; public class GroupStats extends PlayerCommandMiddle { diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/InfoDump.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/InfoDump.java index 7ac2d8ce..9a8fb4aa 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/InfoDump.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/InfoDump.java @@ -3,7 +3,6 @@ import java.util.List; import java.util.UUID; -import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/InvitePlayer.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/InvitePlayer.java index 19c33d24..af8d21fb 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/InvitePlayer.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/InvitePlayer.java @@ -2,19 +2,17 @@ import java.util.ArrayList; import java.util.List; -import java.util.Set; import java.util.UUID; -import net.md_5.bungee.api.chat.ClickEvent; -import net.md_5.bungee.api.chat.ComponentBuilder; -import net.md_5.bungee.api.chat.HoverEvent; -import net.md_5.bungee.api.chat.TextComponent; - import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import net.md_5.bungee.api.chat.ClickEvent; +import net.md_5.bungee.api.chat.ComponentBuilder; +import net.md_5.bungee.api.chat.HoverEvent; +import net.md_5.bungee.api.chat.TextComponent; import vg.civcraft.mc.namelayer.GroupManager; import vg.civcraft.mc.namelayer.GroupManager.PlayerType; import vg.civcraft.mc.namelayer.NameAPI; diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/ListCurrentInvites.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/ListCurrentInvites.java index 4b45d628..902f4baf 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/ListCurrentInvites.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/ListCurrentInvites.java @@ -1,5 +1,7 @@ package vg.civcraft.mc.namelayer.command.commands; +import java.util.List; + import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -7,8 +9,6 @@ import vg.civcraft.mc.namelayer.command.PlayerCommandMiddle; import vg.civcraft.mc.namelayer.listeners.PlayerListener; -import java.util.List; - public class ListCurrentInvites extends PlayerCommandMiddle{ public ListCurrentInvites(String name) { diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/ListMembers.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/ListMembers.java index b7e0ace5..a901545c 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/ListMembers.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/ListMembers.java @@ -9,7 +9,6 @@ import com.google.common.collect.Lists; -import vg.civcraft.mc.namelayer.GroupManager; import vg.civcraft.mc.namelayer.GroupManager.PlayerType; import vg.civcraft.mc.namelayer.NameAPI; import vg.civcraft.mc.namelayer.command.PlayerCommandMiddle; diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/ListPlayerTypes.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/ListPlayerTypes.java index dcd7b5c9..98bb5287 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/ListPlayerTypes.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/ListPlayerTypes.java @@ -1,13 +1,13 @@ package vg.civcraft.mc.namelayer.command.commands; +import java.util.List; + import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import vg.civcraft.mc.namelayer.GroupManager.PlayerType; import vg.civcraft.mc.namelayer.command.PlayerCommandMiddle; -import java.util.List; - public class ListPlayerTypes extends PlayerCommandMiddle{ public ListPlayerTypes(String name) { diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/ListSubGroups.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/ListSubGroups.java index d74dde02..6eeb60f6 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/ListSubGroups.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/ListSubGroups.java @@ -3,7 +3,6 @@ import java.util.List; import java.util.Set; import java.util.UUID; -import java.util.logging.Level; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; @@ -13,7 +12,6 @@ import vg.civcraft.mc.namelayer.GroupManager; import vg.civcraft.mc.namelayer.NameAPI; -import vg.civcraft.mc.namelayer.NameLayerPlugin; import vg.civcraft.mc.namelayer.command.PlayerCommandMiddle; import vg.civcraft.mc.namelayer.group.Group; import vg.civcraft.mc.namelayer.permission.PermissionType; diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/PromotePlayer.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/PromotePlayer.java index da393970..d84ec75a 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/PromotePlayer.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/PromotePlayer.java @@ -11,17 +11,13 @@ import vg.civcraft.mc.namelayer.GroupManager.PlayerType; import vg.civcraft.mc.namelayer.NameAPI; -import vg.civcraft.mc.namelayer.NameLayerPlugin; import vg.civcraft.mc.namelayer.command.PlayerCommandMiddle; import vg.civcraft.mc.namelayer.command.TabCompleters.GroupMemberTabCompleter; import vg.civcraft.mc.namelayer.command.TabCompleters.GroupTabCompleter; -import vg.civcraft.mc.namelayer.command.TabCompleters.InviteTabCompleter; import vg.civcraft.mc.namelayer.command.TabCompleters.MemberTypeCompleter; +import vg.civcraft.mc.namelayer.events.PromotePlayerEvent; import vg.civcraft.mc.namelayer.group.Group; -import vg.civcraft.mc.namelayer.listeners.PlayerListener; -import vg.civcraft.mc.namelayer.permission.GroupPermission; import vg.civcraft.mc.namelayer.permission.PermissionType; -import vg.civcraft.mc.namelayer.events.PromotePlayerEvent; public class PromotePlayer extends PlayerCommandMiddle{ diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/RejectInvite.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/RejectInvite.java index 8bdfe65c..99445588 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/RejectInvite.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/RejectInvite.java @@ -1,12 +1,5 @@ package vg.civcraft.mc.namelayer.command.commands; -import vg.civcraft.mc.namelayer.GroupManager; -import vg.civcraft.mc.namelayer.NameAPI; -import vg.civcraft.mc.namelayer.command.PlayerCommandMiddle; -import vg.civcraft.mc.namelayer.command.TabCompleters.InviteTabCompleter; -import vg.civcraft.mc.namelayer.group.Group; -import vg.civcraft.mc.namelayer.listeners.PlayerListener; - import java.util.List; import java.util.UUID; @@ -14,6 +7,13 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import vg.civcraft.mc.namelayer.GroupManager; +import vg.civcraft.mc.namelayer.NameAPI; +import vg.civcraft.mc.namelayer.command.PlayerCommandMiddle; +import vg.civcraft.mc.namelayer.command.TabCompleters.InviteTabCompleter; +import vg.civcraft.mc.namelayer.group.Group; +import vg.civcraft.mc.namelayer.listeners.PlayerListener; + public class RejectInvite extends PlayerCommandMiddle { public RejectInvite(String name) { diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/RemoveBlacklist.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/RemoveBlacklist.java index a68101ef..e8ad0e1b 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/RemoveBlacklist.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/RemoveBlacklist.java @@ -2,7 +2,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Set; import java.util.UUID; import org.bukkit.Bukkit; diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/RemoveMember.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/RemoveMember.java index ada6c36e..0abe52ff 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/RemoveMember.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/RemoveMember.java @@ -7,14 +7,12 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import vg.civcraft.mc.namelayer.GroupManager; import vg.civcraft.mc.namelayer.GroupManager.PlayerType; import vg.civcraft.mc.namelayer.NameAPI; import vg.civcraft.mc.namelayer.command.PlayerCommandMiddle; import vg.civcraft.mc.namelayer.command.TabCompleters.GroupMemberTabCompleter; import vg.civcraft.mc.namelayer.command.TabCompleters.GroupTabCompleter; import vg.civcraft.mc.namelayer.group.Group; -import vg.civcraft.mc.namelayer.permission.GroupPermission; import vg.civcraft.mc.namelayer.permission.PermissionType; public class RemoveMember extends PlayerCommandMiddle { diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/RevokeInvite.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/RevokeInvite.java index 3f76eb1c..c857220e 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/RevokeInvite.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/RevokeInvite.java @@ -7,10 +7,9 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import vg.civcraft.mc.namelayer.GroupManager.PlayerType; import vg.civcraft.mc.namelayer.GroupManager; +import vg.civcraft.mc.namelayer.GroupManager.PlayerType; import vg.civcraft.mc.namelayer.NameAPI; -import vg.civcraft.mc.namelayer.NameLayerPlugin; import vg.civcraft.mc.namelayer.command.PlayerCommandMiddle; import vg.civcraft.mc.namelayer.command.TabCompleters.GroupTabCompleter; import vg.civcraft.mc.namelayer.group.Group; diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/SetPassword.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/SetPassword.java index 0f76fbf5..f9858e14 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/SetPassword.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/SetPassword.java @@ -12,7 +12,6 @@ import vg.civcraft.mc.namelayer.command.PlayerCommandMiddle; import vg.civcraft.mc.namelayer.command.TabCompleters.GroupTabCompleter; import vg.civcraft.mc.namelayer.group.Group; -import vg.civcraft.mc.namelayer.permission.GroupPermission; import vg.civcraft.mc.namelayer.permission.PermissionType; public class SetPassword extends PlayerCommandMiddle{ diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/TransferGroup.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/TransferGroup.java index 5516a4d4..7c0bc64d 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/TransferGroup.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/TransferGroup.java @@ -2,6 +2,7 @@ import java.util.List; import java.util.UUID; + import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -31,7 +32,7 @@ public boolean execute(CommandSender sender, String[] args) { return true; } Player p = (Player) sender; - Group g = gm.getGroup(args[0]); + Group g = GroupManager.getGroup(args[0]); if (groupIsNull(sender, args[0], g)) { return true; } diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/UpdateName.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/UpdateName.java index 4a3bfa3c..6f9ed392 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/UpdateName.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/command/commands/UpdateName.java @@ -1,7 +1,6 @@ package vg.civcraft.mc.namelayer.command.commands; import java.util.Collections; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.TreeMap; @@ -51,9 +50,7 @@ public boolean execute(CommandSender sender, String[] args) { NameLayerPlugin.getInstance(), new Runnable() { @Override public void run() { - List uuids = new LinkedList(); - uuids.add(uuid); - NameFetcher fetcher = new NameFetcher(uuids); + NameFetcher fetcher = new NameFetcher(Collections.singletonList(uuid)); Map fetchedNames = null; try { fetchedNames = fetcher.call(); @@ -129,9 +126,7 @@ public List tabComplete(CommandSender sender, String[] args) { return null; } if (newNames.get(((Player) sender).getUniqueId()) != null) { - List conf = new LinkedList(); - conf.add("CONFIRM"); - return conf; + return Collections.singletonList("CONFIRM"); } return null; } diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/database/AssociationList.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/database/AssociationList.java index 65589e59..002b40e5 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/database/AssociationList.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/database/AssociationList.java @@ -89,8 +89,8 @@ public void registerMigrations(){ /** * returns null if no uuid was found - * @param playername - * @return + * @param playername the player's name + * @return the UUID of the player, or null */ public UUID getUUID(String playername){ try (Connection connection = db.getConnection(); @@ -111,8 +111,8 @@ public UUID getUUID(String playername){ /** * returns null if no playername was found - * @param uuid - * @return + * @param uuid get the current server's name for this UUId + * @return the player's name if found */ public String getCurrentName(UUID uuid){ try (Connection connection = db.getConnection(); @@ -161,8 +161,10 @@ public void changePlayer(String newName, UUID uuid) { /** * This method returns all player info in the table. It is used mainly * by NameAPI class to prepopulate the maps. - * As such PlayerMappingInfo.nameMapping will return Map - * while PlayerMappingInfo.uuidMapping will return Map + * As such PlayerMappingInfo.nameMapping will return Map<String, UUID> + * while PlayerMappingInfo.uuidMapping will return Map<UUID, String> + * + * @return the player mapping info is possible */ public PlayerMappingInfo getAllPlayerInfo(){ Map nameMapping = new HashMap(); diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/database/GroupManagerDao.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/database/GroupManagerDao.java index 8df599f2..95df7d86 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/database/GroupManagerDao.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/database/GroupManagerDao.java @@ -1,6 +1,5 @@ package vg.civcraft.mc.namelayer.database; -import java.util.concurrent.Callable; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -10,13 +9,13 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; -import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.TreeMap; import java.util.UUID; -import java.util.Map.Entry; +import java.util.concurrent.Callable; import java.util.logging.Level; import java.util.logging.Logger; @@ -24,13 +23,13 @@ import com.google.common.collect.Lists; +import vg.civcraft.mc.civmodcore.dao.ManagedDatasource; import vg.civcraft.mc.namelayer.GroupManager; import vg.civcraft.mc.namelayer.GroupManager.PlayerType; import vg.civcraft.mc.namelayer.NameLayerPlugin; import vg.civcraft.mc.namelayer.group.Group; import vg.civcraft.mc.namelayer.listeners.PlayerListener; import vg.civcraft.mc.namelayer.permission.PermissionType; -import vg.civcraft.mc.civmodcore.dao.ManagedDatasource; /** * First guinea pig of conversion to ManagedDatasource. * @@ -341,12 +340,12 @@ public Boolean call() { try (Connection connection = db.getConnection(); PreparedStatement permInit = connection.prepareStatement(addPermissionById); PreparedStatement permReg = connection.prepareStatement(registerPermission); ) { - Map permIds = new HashMap(); + Map permIds = new HashMap<>(); - LinkedList unspool = new LinkedList(); + List unspool = new ArrayList<>(); int maximumId = 0; try (Statement getOldPerms = connection.createStatement(); - ResultSet res = getOldPerms.executeQuery("select * from permissions");) { + ResultSet res = getOldPerms.executeQuery("SELECT * FROM permissions")) { while(res.next()) { unspool.add(new Object[]{res.getInt(1), res.getString(2), res.getString(3)}); if (res.getInt(1) > maximumId) maximumId = res.getInt(1); @@ -928,7 +927,7 @@ public void run() { }); } - public void addPermission(String groupName, String role, List perms){ + public void addPermission(String groupName, String role, List perms) { try (Connection connection = db.getConnection(); PreparedStatement addPermission = connection.prepareStatement(GroupManagerDao.addPermission)){ for(PermissionType perm : perms) { @@ -1057,7 +1056,7 @@ public void run() { public void addNewDefaultPermission(List playerTypes, PermissionType perm) { try (Connection connection = db.getConnection();) { - List groups = new LinkedList(); + List groups = new ArrayList<>(); try (Statement getAllGroupIds = connection.createStatement(); ResultSet set = getAllGroupIds.executeQuery(GroupManagerDao.getAllGroupIds);) { // unpack ids; @@ -1224,7 +1223,7 @@ public Set loadAllAutoAccept() { /** * Adds the uuid to the db if they should auto accept groups when invited. - * @param uuid + * @param uuid sets up this player by uuid to accept groups async */ public void autoAcceptGroupsAsync(final UUID uuid){ plugin.getServer().getScheduler().runTaskAsynchronously(plugin, new Runnable(){ @@ -1680,8 +1679,8 @@ public Set getBlackListMembers(String groupName) { * we arbitrarily define primacy as the one with the most members for ease of accounting * and backwards compatibility. * - * @param groupName - * @return + * @param groupName the group name to get IDs for + * @return the list of IDs for this group name */ public List getAllIDs(String groupName) { if (groupName == null) { @@ -1691,7 +1690,7 @@ public List getAllIDs(String groupName) { PreparedStatement getGroupIDs = connection.prepareStatement(GroupManagerDao.getGroupIDs);){ getGroupIDs.setString(1, groupName); try (ResultSet set = getGroupIDs.executeQuery();) { - LinkedList ids = new LinkedList(); + List ids = new ArrayList<>(); while (set.next()) { ids.add(set.getInt(1)); diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/events/GroupRemoveInvitation.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/events/GroupRemoveInvitation.java index e9ca8ba5..bbeeae9b 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/events/GroupRemoveInvitation.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/events/GroupRemoveInvitation.java @@ -6,8 +6,6 @@ import org.bukkit.event.Event; import org.bukkit.event.HandlerList; -import vg.civcraft.mc.namelayer.GroupManager.PlayerType; - public class GroupRemoveInvitation extends Event implements Cancellable{ private static final HandlerList handlers = new HandlerList(); diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/events/PromotePlayerEvent.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/events/PromotePlayerEvent.java index 3065d96a..d87f4892 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/events/PromotePlayerEvent.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/events/PromotePlayerEvent.java @@ -2,14 +2,14 @@ import java.util.logging.Level; +import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; -import org.bukkit.entity.Player; +import vg.civcraft.mc.namelayer.GroupManager.PlayerType; import vg.civcraft.mc.namelayer.NameLayerPlugin; import vg.civcraft.mc.namelayer.group.Group; -import vg.civcraft.mc.namelayer.GroupManager.PlayerType; public class PromotePlayerEvent extends Event implements Cancellable{ private static final HandlerList handlers = new HandlerList(); diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/group/Group.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/group/Group.java index 4d9f7f42..4f2230f7 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/group/Group.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/group/Group.java @@ -258,8 +258,7 @@ public PlayerType getInvite(UUID uuid) { /** * Removes the invite of a Player - * @param uuid- The UUID of the player. - * @param saveToDB - remove the invitation from the DB. + * @param uuid - The UUID of the player. */ public void removeInvite(UUID uuid){ removeInvite(uuid, true); @@ -380,8 +379,9 @@ public void removeAllMembers(boolean savetodb) { /** * - * @param supergroup - * @param subgroup + * @param supergroup the base group + * @param subgroup the group to link under it + * @param saveToDb - add link to the DB. * @return true if linking succeeded, false otherwise. */ public static boolean link(Group supergroup, Group subgroup, boolean saveToDb) { @@ -414,8 +414,9 @@ public static boolean link(Group supergroup, Group subgroup, boolean saveToDb) { /** * - * @param supergroup - * @param subgroup + * @param supergroup the main group + * @param subgroup the sub group to unlink + * @return true if unlink succeeded, false otherwise */ public static boolean unlink(Group supergroup, Group subgroup){ return unlink(supergroup,subgroup, true); @@ -497,7 +498,7 @@ public void changeDefaultGroup(UUID uuid) { public UUID getOwner() { return owner; } /** - * @param uuid + * @param uuid the uuid of owner * @return true if the UUID belongs to the owner of the group, false otherwise. */ public boolean isOwner(UUID uuid) { return owner.equals(uuid); } @@ -586,6 +587,8 @@ public void setGroupId(int id) { /** * Updates/replaces the group id list with a new one. Clears the old one, adds these, * and ensures that the "main" id is added to the list as well. + * + * @param ids the list of IDs to replace */ public void setGroupIds(List ids) { this.ids.clear(); diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/AbstractGroupGUI.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/AbstractGroupGUI.java index 00b8449d..3062eb8b 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/AbstractGroupGUI.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/AbstractGroupGUI.java @@ -1,15 +1,14 @@ package vg.civcraft.mc.namelayer.gui; import org.bukkit.Bukkit; -import org.bukkit.entity.Player; import org.bukkit.Material; +import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import vg.civcraft.mc.namelayer.GroupManager; import vg.civcraft.mc.namelayer.NameAPI; import vg.civcraft.mc.namelayer.NameLayerPlugin; import vg.civcraft.mc.namelayer.group.Group; - import vg.civcraft.mc.namelayer.misc.ClassHandler; import vg.civcraft.mc.namelayer.misc.MaterialInterface; diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/AdminFunctionsGUI.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/AdminFunctionsGUI.java index 2e432ae6..4cb91836 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/AdminFunctionsGUI.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/AdminFunctionsGUI.java @@ -1,9 +1,10 @@ package vg.civcraft.mc.namelayer.gui; -import java.util.LinkedList; +import java.util.ArrayList; import java.util.List; import java.util.UUID; import java.util.logging.Level; +import java.util.stream.Collectors; import org.bukkit.Bukkit; import org.bukkit.ChatColor; @@ -11,11 +12,12 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; +import org.bukkit.util.StringUtil; +import vg.civcraft.mc.civmodcore.api.ItemAPI; import vg.civcraft.mc.civmodcore.chatDialog.Dialog; import vg.civcraft.mc.civmodcore.inventorygui.Clickable; import vg.civcraft.mc.civmodcore.inventorygui.ClickableInventory; import vg.civcraft.mc.civmodcore.inventorygui.DecorationStack; -import vg.civcraft.mc.civmodcore.itemHandling.ISUtils; import vg.civcraft.mc.namelayer.NameAPI; import vg.civcraft.mc.namelayer.NameLayerPlugin; import vg.civcraft.mc.namelayer.command.commands.TransferGroup; @@ -35,31 +37,17 @@ public void showScreen() { ClickableInventory ci = new ClickableInventory(27, g.getName()); // linking ItemStack linkStack = new ItemStack(Material.GOLD_INGOT); - ISUtils.setName(linkStack, ChatColor.GOLD + "Link group"); + ItemAPI.setDisplayName(linkStack, ChatColor.GOLD + "Link group"); Clickable linkClick; - //Linking is currently disabled -// if (gm.hasAccess(g, p.getUniqueId(), -// PermissionType.getPermission("LINKING"))) { -// linkClick = new Clickable(linkStack) { -// @Override -// public void clicked(Player p) { -// showLinkingMenu(); -// } -// }; -// } else { -// ISUtils.addLore(linkStack, ChatColor.RED -// + "You don't have permission to do this"); -// linkClick = new DecorationStack(linkStack); -// } - ISUtils.addLore(linkStack, ChatColor.RED + ItemAPI.addLore(linkStack, ChatColor.RED + "Sorry, group linking is not a currently supported feature."); linkClick = new DecorationStack(linkStack); ci.setSlot(linkClick, 10); // merging ItemStack mergeStack = new ItemStack(Material.SPONGE); - ISUtils.setName(mergeStack, ChatColor.GOLD + "Merge group"); + ItemAPI.setDisplayName(mergeStack, ChatColor.GOLD + "Merge group"); Clickable mergeClick; if (gm.hasAccess(g, p.getUniqueId(), PermissionType.getPermission("MERGE"))) { @@ -70,14 +58,14 @@ public void clicked(Player p) { } }; } else { - ISUtils.addLore(mergeStack, ChatColor.RED + ItemAPI.addLore(mergeStack, ChatColor.RED + "You don't have permission to do this"); mergeClick = new DecorationStack(mergeStack); } ci.setSlot(mergeClick, 12); // transferring group ItemStack transferStack = new ItemStack(Material.PACKED_ICE); - ISUtils.setName(transferStack, ChatColor.GOLD + ItemAPI.setDisplayName(transferStack, ChatColor.GOLD + "Transfer group to new primary owner"); Clickable transferClick; if (g.isOwner(p.getUniqueId())) { @@ -88,14 +76,14 @@ public void clicked(Player p) { } }; } else { - ISUtils.addLore(transferStack, ChatColor.RED + ItemAPI.addLore(transferStack, ChatColor.RED + "You don't have permission to do this"); transferClick = new DecorationStack(transferStack); } ci.setSlot(transferClick, 14); // deleting group ItemStack deletionStack = new ItemStack(Material.BARRIER); - ISUtils.setName(deletionStack, ChatColor.GOLD + "Delete group"); + ItemAPI.setDisplayName(deletionStack, ChatColor.GOLD + "Delete group"); Clickable deletionClick; if (gm.hasAccess(g, p.getUniqueId(), PermissionType.getPermission("DELETE"))) { @@ -106,7 +94,7 @@ public void clicked(Player p) { } }; } else { - ISUtils.addLore(deletionStack, ChatColor.RED + ItemAPI.addLore(deletionStack, ChatColor.RED + "You don't have permission to do this"); deletionClick = new DecorationStack(deletionStack); } @@ -114,7 +102,7 @@ public void clicked(Player p) { // back button ItemStack backToOverview = goBackStack(); - ISUtils.setName(backToOverview, ChatColor.GOLD + "Back to overview"); + ItemAPI.setDisplayName(backToOverview, ChatColor.GOLD + "Back to overview"); ci.setSlot(new Clickable(backToOverview) { @Override @@ -139,26 +127,17 @@ private void showTransferingMenu() { p.sendMessage(ChatColor.GOLD + "Enter the name of the new primary owner or \"cancel\" to exit this prompt"); ClickableInventory.forceCloseInventory(p); - Dialog dia = new Dialog(p, NameLayerPlugin.getInstance()) { + new Dialog(p, NameLayerPlugin.getInstance()) { @Override public List onTabComplete(String word, String[] arg1) { - List names; - names = new LinkedList(); - for (Player p : Bukkit.getOnlinePlayers()) { - names.add(p.getName()); - } - if (word.equals("")) { - return names; - } - List result = new LinkedList(); - String comp = word.toLowerCase(); - for (String s : names) { - if (s.toLowerCase().startsWith(comp)) { - result.add(s); - } - } - return result; + List players = Bukkit.getOnlinePlayers().stream() + .filter(p -> g.isMember(p.getUniqueId())) + .map(Player::getName) + .collect(Collectors.toList()); + players.add("cancel"); + + return StringUtil.copyPartialMatches(word, players, new ArrayList<>()); } @Override @@ -183,17 +162,17 @@ public void onReply(String[] arg0) { ClickableInventory confirmInv = new ClickableInventory(27, g.getName()); ItemStack info = new ItemStack(Material.PAPER); - ISUtils.setName(info, ChatColor.GOLD + "Transfer group to " + ItemAPI.setDisplayName(info, ChatColor.GOLD + "Transfer group to " + playerName); - ISUtils.addLore(info, ChatColor.RED + ItemAPI.addLore(info, ChatColor.RED + "Are you sure that you want to", ChatColor.RED + "transfer this group? You can not undo this!"); ItemStack yes = yesStack(); - ISUtils.setName(yes, - ChatColor.GOLD + "Yes, transfer " + g.getName() + ItemAPI.setDisplayName(yes, + ChatColor.GOLD + "Yes, transfer " + g.getName() + " to " + playerName); ItemStack no = noStack(); - ISUtils.setName(no, + ItemAPI.setDisplayName(no, ChatColor.GOLD + "No, don't transfer " + g.getName()); confirmInv.setSlot(new Clickable(yes) { @@ -231,14 +210,14 @@ public void clicked(Player p) { private void showDeletionMenu() { ClickableInventory confirmInv = new ClickableInventory(27, g.getName()); ItemStack info = new ItemStack(Material.PAPER); - ISUtils.setName(info, ChatColor.GOLD + "Delete group"); - ISUtils.addLore(info, ChatColor.RED + "Are you sure that you want to", + ItemAPI.setDisplayName(info, ChatColor.GOLD + "Delete group"); + ItemAPI.addLore(info, ChatColor.RED + "Are you sure that you want to", ChatColor.RED + "delete this group? You can not undo this!"); ItemStack yes = yesStack(); - ISUtils.setName(yes, ChatColor.GOLD + "Yes, delete " + g.getName()); + ItemAPI.setDisplayName(yes, ChatColor.GOLD + "Yes, delete " + g.getName()); ItemStack no = noStack(); - ISUtils.setName(no, ChatColor.GOLD + "No, keep " + g.getName()); + ItemAPI.setDisplayName(no, ChatColor.GOLD + "No, keep " + g.getName()); confirmInv.setSlot(new Clickable(yes) { @Override diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/GUIGroupOverview.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/GUIGroupOverview.java index ec2b2929..3bc4c93b 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/GUIGroupOverview.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/GUIGroupOverview.java @@ -3,8 +3,8 @@ import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.ArrayList; +import java.util.Collections; import java.util.HashSet; -import java.util.LinkedList; import java.util.List; import java.util.Set; import java.util.UUID; @@ -19,16 +19,16 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; +import vg.civcraft.mc.civmodcore.api.ItemAPI; import vg.civcraft.mc.civmodcore.chatDialog.Dialog; import vg.civcraft.mc.civmodcore.inventorygui.Clickable; import vg.civcraft.mc.civmodcore.inventorygui.ClickableInventory; import vg.civcraft.mc.civmodcore.inventorygui.DecorationStack; -import vg.civcraft.mc.civmodcore.itemHandling.ISUtils; import vg.civcraft.mc.namelayer.GroupManager; +import vg.civcraft.mc.namelayer.GroupManager.PlayerType; import vg.civcraft.mc.namelayer.NameAPI; import vg.civcraft.mc.namelayer.NameLayerPlugin; import vg.civcraft.mc.namelayer.RunnableOnGroup; -import vg.civcraft.mc.namelayer.GroupManager.PlayerType; import vg.civcraft.mc.namelayer.group.Group; import vg.civcraft.mc.namelayer.permission.GroupPermission; import vg.civcraft.mc.namelayer.permission.PermissionType; @@ -97,7 +97,7 @@ public void clicked(Player p) { // previous button if (currentPage > 0) { ItemStack back = new ItemStack(Material.ARROW); - ISUtils.setName(back, ChatColor.GOLD + "Go to previous page"); + ItemAPI.setDisplayName(back, ChatColor.GOLD + "Go to previous page"); Clickable baCl = new Clickable(back) { @Override @@ -113,7 +113,7 @@ public void clicked(Player arg0) { // next button if ((45 * (currentPage + 1)) <= groups.size()) { ItemStack forward = new ItemStack(Material.ARROW); - ISUtils.setName(forward, ChatColor.GOLD + "Go to next page"); + ItemAPI.setDisplayName(forward, ChatColor.GOLD + "Go to next page"); Clickable forCl = new Clickable(forward) { @Override @@ -129,7 +129,7 @@ public void clicked(Player arg0) { // close button ItemStack backToOverview = AbstractGroupGUI.goBackStack(); - ISUtils.setName(backToOverview, ChatColor.GOLD + "Close"); + ItemAPI.setDisplayName(backToOverview, ChatColor.GOLD + "Close"); ci.setSlot(new Clickable(backToOverview) { @Override @@ -162,23 +162,23 @@ private List getGroupClickables() { switch (pType) { case MEMBERS: is = new ItemStack(Material.LEATHER_CHESTPLATE); - ISUtils.addLore(is, ChatColor.AQUA + "Your rank: Member"); + ItemAPI.addLore(is, ChatColor.AQUA + "Your rank: Member"); break; case MODS: is = AbstractGroupGUI.modStack(); - ISUtils.addLore(is, ChatColor.AQUA + "Your rank: Mod"); + ItemAPI.addLore(is, ChatColor.AQUA + "Your rank: Mod"); break; case ADMINS: is = new ItemStack(Material.IRON_CHESTPLATE); - ISUtils.addLore(is, ChatColor.AQUA + "Your rank: Admin"); + ItemAPI.addLore(is, ChatColor.AQUA + "Your rank: Admin"); break; case OWNER: is = new ItemStack(Material.DIAMOND_CHESTPLATE); if (g.isOwner(p.getUniqueId())) { - ISUtils.addLore(is, ChatColor.AQUA + ItemAPI.addLore(is, ChatColor.AQUA + "Your rank: Primary owner"); } else { - ISUtils.addLore(is, ChatColor.AQUA + "Your rank: Owner"); + ItemAPI.addLore(is, ChatColor.AQUA + "Your rank: Owner"); } break; } @@ -196,14 +196,14 @@ private List getGroupClickables() { is.setItemMeta(im); if (gm.hasAccess(g, p.getUniqueId(), PermissionType.getPermission("GROUPSTATS"))) { - ISUtils.addLore( + ItemAPI.addLore( is, ChatColor.AQUA + String.valueOf(g.getAllMembers().size()) + " member" + (g.getAllMembers().size() > 1 ? "s" : "")); } - ISUtils.setName(is, ChatColor.GOLD + g.getName()); + ItemAPI.setDisplayName(is, ChatColor.GOLD + g.getName()); if (gm.hasAccess(g, p.getUniqueId(), PermissionType.getPermission("OPEN_GUI"))) { c = new Clickable(is) { @@ -214,7 +214,7 @@ public void clicked(Player arg0) { } }; } else { - ISUtils.addLore(is, ChatColor.RED + ItemAPI.addLore(is, ChatColor.RED + "You aren't permitted to open", ChatColor.RED + "the GUI for this group"); c = new DecorationStack(is); @@ -227,7 +227,7 @@ public void clicked(Player arg0) { private Clickable getCreateGroupClickable() { ItemStack is = new ItemStack(Material.APPLE); - ISUtils.setName(is, ChatColor.GOLD + "Create group"); + ItemAPI.setDisplayName(is, ChatColor.GOLD + "Create group"); Clickable c = new Clickable(is) { @Override @@ -235,12 +235,12 @@ public void clicked(final Player p) { p.sendMessage(ChatColor.YELLOW + "Enter the name of your new group or \"cancel\" to exit this prompt"); ClickableInventory.forceCloseInventory(p); - Dialog dia = new Dialog(p, NameLayerPlugin.getInstance()) { + new Dialog(p, NameLayerPlugin.getInstance()) { @Override public List onTabComplete(String wordCompleted, String[] fullMessage) { - return new LinkedList(); + return Collections.emptyList(); } @Override @@ -341,18 +341,18 @@ public void run() { private Clickable getJoinGroupClickable() { ItemStack is = new ItemStack(Material.CHEST); - ISUtils.setName(is, ChatColor.GOLD + "Join password protected group"); + ItemAPI.setDisplayName(is, ChatColor.GOLD + "Join password protected group"); Clickable c = new Clickable(is) { @Override public void clicked(final Player p) { p.sendMessage(ChatColor.YELLOW + "Enter the name of the group or \"cancel\" to leave this prompt"); ClickableInventory.forceCloseInventory(p); - Dialog dia = new Dialog(p, NameLayerPlugin.getInstance()) { + new Dialog(p, NameLayerPlugin.getInstance()) { @Override public List onTabComplete(String wordCompleted, String[] fullMessage) { - return new LinkedList(); + return Collections.emptyList(); } @Override @@ -383,7 +383,7 @@ public void onReply(String[] message) { @Override public List onTabComplete(String wordCompleted, String[] fullMessage) { - return new LinkedList(); + return Collections.emptyList(); } @Override diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/InvitationGUI.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/InvitationGUI.java index 706deefe..1e818f4e 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/InvitationGUI.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/InvitationGUI.java @@ -1,9 +1,10 @@ package vg.civcraft.mc.namelayer.gui; -import java.util.LinkedList; +import java.util.ArrayList; import java.util.List; import java.util.UUID; import java.util.logging.Level; +import java.util.stream.Collectors; import org.bukkit.Bukkit; import org.bukkit.ChatColor; @@ -13,14 +14,15 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; +import org.bukkit.util.StringUtil; +import vg.civcraft.mc.civmodcore.api.ItemAPI; import vg.civcraft.mc.civmodcore.chatDialog.Dialog; import vg.civcraft.mc.civmodcore.inventorygui.Clickable; import vg.civcraft.mc.civmodcore.inventorygui.ClickableInventory; import vg.civcraft.mc.civmodcore.inventorygui.DecorationStack; -import vg.civcraft.mc.civmodcore.itemHandling.ISUtils; +import vg.civcraft.mc.namelayer.GroupManager.PlayerType; import vg.civcraft.mc.namelayer.NameAPI; import vg.civcraft.mc.namelayer.NameLayerPlugin; -import vg.civcraft.mc.namelayer.GroupManager.PlayerType; import vg.civcraft.mc.namelayer.command.commands.InvitePlayer; import vg.civcraft.mc.namelayer.group.Group; import vg.civcraft.mc.namelayer.permission.PermissionType; @@ -40,8 +42,8 @@ private void showScreen() { ClickableInventory ci = new ClickableInventory(27, g.getName()); ItemStack explain = new ItemStack(Material.PAPER); - ISUtils.setName(explain, ChatColor.GOLD + "Select an option"); - ISUtils.addLore(explain, ChatColor.AQUA + "Please select the rank ", ChatColor.AQUA + "you want the invited player to have"); + ItemAPI.setDisplayName(explain, ChatColor.GOLD + "Select an option"); + ItemAPI.addLore(explain, ChatColor.AQUA + "Please select the rank ", ChatColor.AQUA + "you want the invited player to have"); ci.setSlot(new DecorationStack(explain), 4); ci.setSlot(produceOptionStack(Material.LEATHER_CHESTPLATE, "member", PlayerType.MEMBERS, PermissionType.getPermission("MEMBERS")), 10); ci.setSlot(produceOptionStack(modMat(), "mod", PlayerType.MODS, PermissionType.getPermission("MODS")), 12); @@ -55,18 +57,18 @@ private Clickable produceOptionStack(Material item, String niceRankName, final P ItemMeta im = is.getItemMeta(); im.addItemFlags(ItemFlag.HIDE_ATTRIBUTES); is.setItemMeta(im); - ISUtils.setName(is, ChatColor.GOLD + "Invite as " + niceRankName); + ItemAPI.setDisplayName(is, ChatColor.GOLD + "Invite as " + niceRankName); Clickable c; if (gm.hasAccess(g, p.getUniqueId(), perm)) { c = new Clickable(is) { @Override public void clicked(Player arg0) { - p.sendMessage(ChatColor.GOLD + "Enter the name of the player to invite or \"cancel\" to exit this prompt. You may also enter the names" - + "of multiple players, separated with spaces to invite all of them"); + p.sendMessage(ChatColor.GOLD + "Enter the name of the player to invite or \"cancel\" to exit this prompt. You may also enter the names " + + "of multiple players, separated with spaces to invite all of them."); selectedType = pType; ClickableInventory.forceCloseInventory(arg0); - Dialog enterName = new Dialog(arg0, NameLayerPlugin.getInstance()) { + new Dialog(arg0, NameLayerPlugin.getInstance()) { public void onReply(String [] message) { if (gm.hasAccess(g, p.getUniqueId(), MainGroupGUI.getAccordingPermission(selectedType))) { for(String s : message) { @@ -80,7 +82,7 @@ public void onReply(String [] message) { continue; } if (g.isMember(inviteUUID)) { // So a player can't demote someone who is above them. - p.sendMessage(ChatColor.RED + NameAPI.getCurrentName(inviteUUID) +" is already a member of " + g.getName()); + p.sendMessage(ChatColor.RED + NameAPI.getCurrentName(inviteUUID) + " is already a member of " + g.getName()); continue; } if(NameLayerPlugin.getBlackList().isBlacklisted(g, inviteUUID)) { @@ -93,42 +95,29 @@ public void onReply(String [] message) { + " to group " + g.getName() + "via gui"); InvitePlayer.sendInvitation(g, pType, inviteUUID, p.getUniqueId(), true); - p.sendMessage(ChatColor.GREEN + "Invited " + NameAPI.getCurrentName(inviteUUID) + " as " + PlayerType.getNiceRankName(pType)); } - } - else { - p.sendMessage(ChatColor.RED + "You lost permission to invite a player to this rank"); + } else { + p.sendMessage(ChatColor.RED + "You do not have permission to invite a player to this rank"); } parent.showScreen(); } - public List onTabComplete(String word, String [] msg) { - List names; - names = new LinkedList(); - for(Player p : Bukkit.getOnlinePlayers()) { - names.add(p.getName()); - } - names.add("cancel"); - if (word.equals("")) { - return names; - } - List result = new LinkedList(); - String comp = word.toLowerCase(); - for(String s : names) { - if (s.toLowerCase().startsWith(comp)) { - result.add(s); - } - } - return result; + public List onTabComplete(String word, String[] msg) { + List players = Bukkit.getOnlinePlayers().stream() + .filter(p -> !g.isMember(p.getUniqueId())) + .map(Player::getName) + .collect(Collectors.toList()); + players.add("cancel"); + + return StringUtil.copyPartialMatches(word, players, new ArrayList<>()); } }; } }; - } - else { - ISUtils.addLore(is, ChatColor.RED + "You don't have permission to invite " + niceRankName); + } else { + ItemAPI.addLore(is, ChatColor.RED + "You don't have permission to invite " + niceRankName); c = new DecorationStack(is); } return c; diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/LinkingGUI.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/LinkingGUI.java index 2b99eb45..8f0b2fd7 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/LinkingGUI.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/LinkingGUI.java @@ -9,10 +9,10 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; +import vg.civcraft.mc.civmodcore.api.ItemAPI; import vg.civcraft.mc.civmodcore.inventorygui.Clickable; import vg.civcraft.mc.civmodcore.inventorygui.ClickableInventory; import vg.civcraft.mc.civmodcore.inventorygui.DecorationStack; -import vg.civcraft.mc.civmodcore.itemHandling.ISUtils; import vg.civcraft.mc.namelayer.NameLayerPlugin; import vg.civcraft.mc.namelayer.group.Group; import vg.civcraft.mc.namelayer.permission.PermissionType; @@ -48,7 +48,7 @@ public void showScreen() { // previous button if (subGroupSelectingPage > 0) { ItemStack back = new ItemStack(Material.ARROW); - ISUtils.setName(back, ChatColor.GOLD + "Go to previous page"); + ItemAPI.setDisplayName(back, ChatColor.GOLD + "Go to previous page"); Clickable baCl = new Clickable(back) { @Override @@ -64,7 +64,7 @@ public void clicked(Player arg0) { // next button if ((45 * (subGroupSelectingPage + 1)) <= clicks.size()) { ItemStack forward = new ItemStack(Material.ARROW); - ISUtils.setName(forward, ChatColor.GOLD + "Go to next page"); + ItemAPI.setDisplayName(forward, ChatColor.GOLD + "Go to next page"); Clickable forCl = new Clickable(forward) { @Override @@ -80,7 +80,7 @@ public void clicked(Player arg0) { // back button ItemStack backToOverview = goBackStack(); - ISUtils.setName(backToOverview, ChatColor.GOLD + "Back to overview"); + ItemAPI.setDisplayName(backToOverview, ChatColor.GOLD + "Back to overview"); ci.setSlot(new Clickable(backToOverview) { @Override @@ -95,10 +95,10 @@ private List getSubClickables() { List clicks = new ArrayList(); for (final Group sub : g.getSubgroups()) { ItemStack is = new ItemStack(Material.MAGMA_CREAM); - ISUtils.setName(is, ChatColor.GOLD + sub.getName()); - ISUtils.addLore(is, ChatColor.AQUA + "This group has " + ItemAPI.setDisplayName(is, ChatColor.GOLD + sub.getName()); + ItemAPI.addLore(is, ChatColor.AQUA + "This group has " + sub.getSubgroups().size() + "sub groups itself"); - ISUtils.addLore(is, ChatColor.DARK_AQUA + ItemAPI.addLore(is, ChatColor.DARK_AQUA + "Click to remove this sub group"); Clickable c = new Clickable(is) { @@ -141,8 +141,8 @@ public void clicked(Player arg0) { private Clickable getAddSubClickable() { ItemStack makeSuper = new ItemStack(Material.LEATHER); - ISUtils.setName(makeSuper, ChatColor.GOLD + "Add a new subgroup"); - ISUtils.addLore( + ItemAPI.setDisplayName(makeSuper, ChatColor.GOLD + "Add a new subgroup"); + ItemAPI.addLore( makeSuper, ChatColor.AQUA + "This option means that the additional group you chose will inherit all members of " @@ -161,14 +161,14 @@ public void clicked(Player arg0) { private Clickable getInfoClickable() { ItemStack is = new ItemStack(Material.PAPER); - ISUtils.setName(is, ChatColor.GOLD + "Linking stats for " + g.getName()); + ItemAPI.setDisplayName(is, ChatColor.GOLD + "Linking stats for " + g.getName()); if (g.hasSuperGroup()) { - ISUtils.addLore(is, ChatColor.AQUA + "Current super group: " + ItemAPI.addLore(is, ChatColor.AQUA + "Current super group: " + g.getSuperGroup().getName()); } else { - ISUtils.addLore(is, ChatColor.AQUA + "No current super group"); + ItemAPI.addLore(is, ChatColor.AQUA + "No current super group"); } - ISUtils.addLore(is, ChatColor.DARK_AQUA + "Currently " + ItemAPI.addLore(is, ChatColor.DARK_AQUA + "Currently " + g.getSubgroups().size() + " sub group" + ((g.getSubgroups().size() == 1) ? "" : "s") + ", which are listed below"); @@ -177,10 +177,10 @@ private Clickable getInfoClickable() { private Clickable getRemoveSuperClickable() { ItemStack is = new ItemStack(Material.DIAMOND); - ISUtils.setName(is, ChatColor.GOLD + "Remove current super group"); - ISUtils.addLore(is, ChatColor.AQUA + g.getSuperGroup().getName() + ItemAPI.setDisplayName(is, ChatColor.GOLD + "Remove current super group"); + ItemAPI.addLore(is, ChatColor.AQUA + g.getSuperGroup().getName() + " is the super group of " + g.getName()); - ISUtils.addLore(is, ChatColor.DARK_AQUA + "Click to remove this link"); + ItemAPI.addLore(is, ChatColor.DARK_AQUA + "Click to remove this link"); Clickable c = new Clickable(is) { @Override @@ -221,8 +221,8 @@ public void clicked(Player arg0) { private Clickable getAddSuperClickable() { ItemStack makeSub = new ItemStack(Material.BEACON); - ISUtils.setName(makeSub, ChatColor.GOLD + "Add super group"); - ISUtils.addLore( + ItemAPI.setDisplayName(makeSub, ChatColor.GOLD + "Add super group"); + ItemAPI.addLore( makeSub, ChatColor.AQUA + "This option means that " @@ -249,16 +249,16 @@ private void showGroupSelector() { continue; } ItemStack is = new ItemStack(Material.MAGMA_CREAM); - ISUtils.setName(is, g.getName()); + ItemAPI.setDisplayName(is, g.getName()); Clickable c; if (!gm.hasAccess(g, p.getUniqueId(), PermissionType.getPermission("LINKING"))) { if (!makingSubGroup && g.hasSuperGroup()) { // making a supergroup, but this one already has one - ISUtils.addLore(is, ChatColor.RED + ItemAPI.addLore(is, ChatColor.RED + "This group already has a super group"); } else { - ISUtils.addLore(is, ChatColor.RED + ItemAPI.addLore(is, ChatColor.RED + "You don't have permission to link this group"); } c = new DecorationStack(is); @@ -287,7 +287,7 @@ public void clicked(Player arg0) { // previous button if (linkSelectingPage > 0) { ItemStack back = new ItemStack(Material.ARROW); - ISUtils.setName(back, ChatColor.GOLD + "Go to previous page"); + ItemAPI.setDisplayName(back, ChatColor.GOLD + "Go to previous page"); Clickable baCl = new Clickable(back) { @Override @@ -303,7 +303,7 @@ public void clicked(Player arg0) { // next button if ((45 * (linkSelectingPage + 1)) <= clicks.size()) { ItemStack forward = new ItemStack(Material.ARROW); - ISUtils.setName(forward, ChatColor.GOLD + "Go to next page"); + ItemAPI.setDisplayName(forward, ChatColor.GOLD + "Go to next page"); Clickable forCl = new Clickable(forward) { @Override @@ -319,7 +319,7 @@ public void clicked(Player arg0) { // close button ItemStack backToOverview = goBackStack(); - ISUtils.setName(backToOverview, ChatColor.GOLD + "Back to overview"); + ItemAPI.setDisplayName(backToOverview, ChatColor.GOLD + "Back to overview"); ci.setSlot(new Clickable(backToOverview) { @Override diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/MainGroupGUI.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/MainGroupGUI.java index b8c9f572..db7d4cdf 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/MainGroupGUI.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/MainGroupGUI.java @@ -1,12 +1,13 @@ package vg.civcraft.mc.namelayer.gui; import java.util.ArrayList; -import java.util.LinkedList; +import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.UUID; import java.util.Map.Entry; +import java.util.UUID; import java.util.logging.Level; +import java.util.stream.Collectors; import org.bukkit.Bukkit; import org.bukkit.ChatColor; @@ -19,12 +20,12 @@ import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.LeatherArmorMeta; +import org.bukkit.util.StringUtil; +import vg.civcraft.mc.civmodcore.api.ItemAPI; import vg.civcraft.mc.civmodcore.chatDialog.Dialog; -import vg.civcraft.mc.civmodcore.chatDialog.DialogManager; import vg.civcraft.mc.civmodcore.inventorygui.Clickable; import vg.civcraft.mc.civmodcore.inventorygui.ClickableInventory; import vg.civcraft.mc.civmodcore.inventorygui.DecorationStack; -import vg.civcraft.mc.civmodcore.itemHandling.ISUtils; import vg.civcraft.mc.namelayer.GroupManager.PlayerType; import vg.civcraft.mc.namelayer.NameAPI; import vg.civcraft.mc.namelayer.NameLayerPlugin; @@ -55,19 +56,19 @@ public MainGroupGUI(Player p, Group g) { showMembers = gm.hasAccess(g, p.getUniqueId(), PermissionType.getPermission("MEMBERS")) || gm.hasAccess(g, p.getUniqueId(), - PermissionType.getPermission("GROUPSTATS")); + PermissionType.getPermission("GROUPSTATS")); showMods = gm.hasAccess(g, p.getUniqueId(), PermissionType.getPermission("MODS")) || gm.hasAccess(g, p.getUniqueId(), - PermissionType.getPermission("GROUPSTATS")); + PermissionType.getPermission("GROUPSTATS")); showAdmins = gm.hasAccess(g, p.getUniqueId(), PermissionType.getPermission("ADMINS")) || gm.hasAccess(g, p.getUniqueId(), - PermissionType.getPermission("GROUPSTATS")); + PermissionType.getPermission("GROUPSTATS")); showOwners = gm.hasAccess(g, p.getUniqueId(), PermissionType.getPermission("OWNER")) || gm.hasAccess(g, p.getUniqueId(), - PermissionType.getPermission("GROUPSTATS")); + PermissionType.getPermission("GROUPSTATS")); currentPage = 0; showScreen(); } @@ -95,7 +96,7 @@ public void showScreen() { // back button if (currentPage > 0) { ItemStack back = new ItemStack(Material.ARROW); - ISUtils.setName(back, ChatColor.GOLD + "Go to previous page"); + ItemAPI.setDisplayName(back, ChatColor.GOLD + "Go to previous page"); Clickable baCl = new Clickable(back) { @Override @@ -111,7 +112,7 @@ public void clicked(Player arg0) { // next button if ((45 * (currentPage + 1)) <= clicks.size()) { ItemStack forward = new ItemStack(Material.ARROW); - ISUtils.setName(forward, ChatColor.GOLD + "Go to next page"); + ItemAPI.setDisplayName(forward, ChatColor.GOLD + "Go to next page"); Clickable forCl = new Clickable(forward) { @Override @@ -139,7 +140,7 @@ public void clicked(Player arg0) { // exit button ItemStack backToOverview = goBackStack(); - ISUtils.setName(backToOverview, ChatColor.GOLD + "Close"); + ItemAPI.setDisplayName(backToOverview, ChatColor.GOLD + "Close"); ci.setSlot(new Clickable(backToOverview) { @Override @@ -165,7 +166,6 @@ public void clicked(Player arg0) { * Creates a list of all Clickables representing members, invitees and * blacklisted players, if they are supposed to be displayed. This is whats * directly fed into the middle of the gui - * */ private List constructClickables() { List clicks = new ArrayList(); @@ -182,11 +182,11 @@ private List constructClickables() { meta.setColor(Color.BLACK); meta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES); is.setItemMeta(meta); - ISUtils.setName(is, NameAPI.getCurrentName(uuid)); + ItemAPI.setDisplayName(is, NameAPI.getCurrentName(uuid)); Clickable c; if (gm.hasAccess(g, p.getUniqueId(), PermissionType.getPermission("BLACKLIST"))) { - ISUtils.addLore(is, ChatColor.GREEN + "Click to remove " + ItemAPI.addLore(is, ChatColor.GREEN + "Click to remove " + NameAPI.getCurrentName(uuid), ChatColor.GREEN + "from the blacklist"); c = new Clickable(is) { @@ -213,10 +213,10 @@ public void clicked(Player arg0) { } }; } else { - ISUtils.addLore(is, ChatColor.RED - + "You dont have permission to remove", + ItemAPI.addLore(is, ChatColor.RED + + "You don't have permission to remove", ChatColor.RED + NameAPI.getCurrentName(uuid) - + "from the blacklist"); + + "from the blacklist"); c = new DecorationStack(is); } clicks.add(c); @@ -233,32 +233,32 @@ public void clicked(Player arg0) { is.setItemMeta(im); final String playerName = NameAPI .getCurrentName(entry.getKey()); - ISUtils.setName(is, ChatColor.GOLD + playerName); + ItemAPI.setDisplayName(is, ChatColor.GOLD + playerName); boolean canRevoke = false; switch (entry.getValue()) { case MEMBERS: - ISUtils.addLore(is, ChatColor.AQUA + "Invited as: Member"); + ItemAPI.addLore(is, ChatColor.AQUA + "Invited as: Member"); if (gm.hasAccess(g, p.getUniqueId(), PermissionType.getPermission("MEMBERS"))) { canRevoke = true; } break; case MODS: - ISUtils.addLore(is, ChatColor.AQUA + "Invited as: Mod"); + ItemAPI.addLore(is, ChatColor.AQUA + "Invited as: Mod"); if (gm.hasAccess(g, p.getUniqueId(), PermissionType.getPermission("MODS"))) { canRevoke = true; } break; case ADMINS: - ISUtils.addLore(is, ChatColor.AQUA + "Invited as: Admin"); + ItemAPI.addLore(is, ChatColor.AQUA + "Invited as: Admin"); if (gm.hasAccess(g, p.getUniqueId(), PermissionType.getPermission("ADMINS"))) { canRevoke = true; } break; case OWNER: - ISUtils.addLore(is, ChatColor.AQUA + "Invited as: Owner"); + ItemAPI.addLore(is, ChatColor.AQUA + "Invited as: Owner"); if (gm.hasAccess(g, p.getUniqueId(), PermissionType.getPermission("OWNER"))) { canRevoke = true; @@ -269,7 +269,7 @@ public void clicked(Player arg0) { } Clickable c = null; if (canRevoke) { - ISUtils.addLore(is, ChatColor.GREEN + ItemAPI.addLore(is, ChatColor.GREEN + "Click to revoke this invite"); c = new Clickable(is) { @@ -288,25 +288,25 @@ public void clicked(Player arg0) { // this boolean allowed = false; switch (pType) { - case MEMBERS: - allowed = gm.hasAccess(g, p.getUniqueId(), - PermissionType.getPermission("MEMBERS")); - break; - case MODS: - allowed = gm.hasAccess(g, p.getUniqueId(), - PermissionType.getPermission("MODS")); - break; - case ADMINS: - allowed = gm.hasAccess(g, p.getUniqueId(), - PermissionType.getPermission("ADMINS")); - break; - case OWNER: - allowed = gm.hasAccess(g, p.getUniqueId(), - PermissionType.getPermission("OWNER")); - break; - default: - allowed = false; - break; + case MEMBERS: + allowed = gm.hasAccess(g, p.getUniqueId(), + PermissionType.getPermission("MEMBERS")); + break; + case MODS: + allowed = gm.hasAccess(g, p.getUniqueId(), + PermissionType.getPermission("MODS")); + break; + case ADMINS: + allowed = gm.hasAccess(g, p.getUniqueId(), + PermissionType.getPermission("ADMINS")); + break; + case OWNER: + allowed = gm.hasAccess(g, p.getUniqueId(), + PermissionType.getPermission("OWNER")); + break; + default: + allowed = false; + break; } if (!allowed) { p.sendMessage(ChatColor.RED @@ -325,7 +325,7 @@ public void clicked(Player arg0) { } }; } else { - ISUtils.addLore(is, ChatColor.RED + ItemAPI.addLore(is, ChatColor.RED + "You don't have permission to revoke this invite"); c = new DecorationStack(is); } @@ -337,32 +337,32 @@ public void clicked(Player arg0) { for (UUID uuid : g.getAllMembers()) { Clickable c = null; switch (g.getPlayerType(uuid)) { - case MEMBERS: - if (showMembers) { - c = constructMemberClickable(Material.LEATHER_CHESTPLATE, - uuid, PlayerType.MEMBERS); - } - break; - case MODS: - if (showMods) { - c = constructMemberClickable(modMat(), - uuid, PlayerType.MODS); - } - break; - case ADMINS: - if (showAdmins) { - c = constructMemberClickable(Material.IRON_CHESTPLATE, - uuid, PlayerType.ADMINS); - } - break; - case OWNER: - if (showOwners) { - c = constructMemberClickable(Material.DIAMOND_CHESTPLATE, - uuid, PlayerType.OWNER); - } - break; - default: - // should never happen + case MEMBERS: + if (showMembers) { + c = constructMemberClickable(Material.LEATHER_CHESTPLATE, + uuid, PlayerType.MEMBERS); + } + break; + case MODS: + if (showMods) { + c = constructMemberClickable(modMat(), + uuid, PlayerType.MODS); + } + break; + case ADMINS: + if (showAdmins) { + c = constructMemberClickable(Material.IRON_CHESTPLATE, + uuid, PlayerType.ADMINS); + } + break; + case OWNER: + if (showOwners) { + c = constructMemberClickable(Material.DIAMOND_CHESTPLATE, + uuid, PlayerType.OWNER); + } + break; + default: + // should never happen } if (c != null) { clicks.add(c); @@ -377,11 +377,11 @@ public void clicked(Player arg0) { * group member types */ private Clickable setupMemberTypeToggle(final PlayerType pType, - boolean initialState) { + boolean initialState) { boolean canEdit = gm.hasAccess(g, p.getUniqueId(), getAccordingPermission(pType)) || gm.hasAccess(g, p.getUniqueId(), - PermissionType.getPermission("GROUPSTATS")); + PermissionType.getPermission("GROUPSTATS")); ItemStack is = MenuUtils.toggleButton(initialState, ChatColor.GOLD + "Show " + PlayerType.getNiceRankName(pType) + "s", canEdit); Clickable c; @@ -391,18 +391,18 @@ private Clickable setupMemberTypeToggle(final PlayerType pType, @Override public void clicked(Player arg0) { switch (pType) { - case MEMBERS: - showMembers = !showMembers; - break; - case MODS: - showMods = !showMods; - break; - case ADMINS: - showAdmins = !showAdmins; - break; - case OWNER: - showOwners = !showOwners; - break; + case MEMBERS: + showMembers = !showMembers; + break; + case MODS: + showMods = !showMods; + break; + case ADMINS: + showAdmins = !showAdmins; + break; + case OWNER: + showOwners = !showOwners; + break; } currentPage = 0; showScreen(); @@ -421,24 +421,24 @@ public void clicked(Player arg0) { * gui, which represent members */ private Clickable constructMemberClickable(Material material, - final UUID toDisplay, PlayerType rank) { + final UUID toDisplay, PlayerType rank) { Clickable c; ItemStack is = new ItemStack(material); ItemMeta im = is.getItemMeta(); im.addItemFlags(ItemFlag.HIDE_ATTRIBUTES); is.setItemMeta(im); - ISUtils.setName(is, ChatColor.GOLD + NameAPI.getCurrentName(toDisplay)); + ItemAPI.setDisplayName(is, ChatColor.GOLD + NameAPI.getCurrentName(toDisplay)); if (g.isOwner(toDisplay)) { // special case for primary owner - ISUtils.addLore(is, ChatColor.AQUA + "Rank: Primary Owner"); - ISUtils.addLore(is, ChatColor.RED + "You don't have permission", + ItemAPI.addLore(is, ChatColor.AQUA + "Rank: Primary Owner"); + ItemAPI.addLore(is, ChatColor.RED + "You don't have permission", ChatColor.RED + "to modify the rank of this player"); c = new DecorationStack(is); } else { - ISUtils.addLore(is, ChatColor.AQUA + "Rank: " + ItemAPI.addLore(is, ChatColor.AQUA + "Rank: " + getRankName(toDisplay)); if (gm.hasAccess(g, p.getUniqueId(), getAccordingPermission(rank))) { - ISUtils.addLore(is, ChatColor.GREEN + ItemAPI.addLore(is, ChatColor.GREEN + "Click to modify this player's", ChatColor.GREEN + "rank or to remove them"); c = new Clickable(is) { @@ -449,7 +449,7 @@ public void clicked(Player arg0) { } }; } else { - ISUtils.addLore(is, + ItemAPI.addLore(is, ChatColor.RED + "You don't have permission", ChatColor.RED + "to modify the rank of this player"); c = new DecorationStack(is); @@ -462,8 +462,8 @@ public void clicked(Player arg0) { * Called when the icon representing a member in the middle of the gui is * clicked, this opens up a detailed view where you can select what to do * (promoting/removing) - * - * @param uuid + * + * @param uuid the UUID to show the inventory to */ public void showDetail(final UUID uuid) { if (!validGroup()) { @@ -474,9 +474,9 @@ public void showDetail(final UUID uuid) { String playerName = NameAPI.getCurrentName(uuid); ItemStack info = new ItemStack(Material.PAPER); - ISUtils.setName(info, ChatColor.GOLD + playerName); + ItemAPI.setDisplayName(info, ChatColor.GOLD + playerName); String rankName = getRankName(uuid); - ISUtils.addLore(info, ChatColor.GOLD + "Current rank: " + rankName); + ItemAPI.addLore(info, ChatColor.GOLD + "Current rank: " + rankName); ci.setSlot(new DecorationStack(info), 4); Clickable memberClick = setupDetailSlot(Material.LEATHER_CHESTPLATE, @@ -493,7 +493,7 @@ public void showDetail(final UUID uuid) { ci.setSlot(ownerClick, 16); ItemStack backToOverview = goBackStack(); - ISUtils.setName(backToOverview, ChatColor.GOLD + "Back to overview"); + ItemAPI.setDisplayName(backToOverview, ChatColor.GOLD + "Back to overview"); ci.setSlot(new Clickable(backToOverview) { @Override @@ -509,7 +509,7 @@ public void clicked(Player arg0) { * easily construct the clickables needed */ private Clickable setupDetailSlot(Material slotMaterial, - final UUID toChange, final PlayerType pType) { + final UUID toChange, final PlayerType pType) { final PlayerType rank = g.getCurrentRank(toChange); ItemStack mod = new ItemStack(slotMaterial); ItemMeta im = mod.getItemMeta(); @@ -517,9 +517,9 @@ private Clickable setupDetailSlot(Material slotMaterial, mod.setItemMeta(im); Clickable modClick; if (rank == pType) { - ISUtils.setName(mod, ChatColor.GOLD + "Remove this player"); + ItemAPI.setDisplayName(mod, ChatColor.GOLD + "Remove this player"); if (!gm.hasAccess(g, p.getUniqueId(), getAccordingPermission(pType))) { - ISUtils.addLore(mod, ChatColor.RED + ItemAPI.addLore(mod, ChatColor.RED + "You dont have permission to do this"); modClick = new DecorationStack(mod); } else { @@ -537,14 +537,14 @@ public void clicked(Player arg0) { }; } } else { - ISUtils.setName( + ItemAPI.setDisplayName( mod, ChatColor.GOLD + demoteOrPromote(g.getPlayerType(toChange), pType, - true) + " this player to " + true) + " this player to " + PlayerType.getNiceRankName(pType)); if (!gm.hasAccess(g, p.getUniqueId(), getAccordingPermission(pType))) { - ISUtils.addLore(mod, ChatColor.RED + ItemAPI.addLore(mod, ChatColor.RED + "You dont have permission to do this"); modClick = new DecorationStack(mod); } else { @@ -592,7 +592,7 @@ private void changePlayerRank(UUID toChange, PlayerType newRank) { p.sendMessage(ChatColor.RED + "This player is no longer on the group and can't be " + demoteOrPromote(g.getCurrentRank(toChange), newRank, - false) + "d"); + false) + "d"); return; } if (g.isOwner(toChange)) { @@ -631,7 +631,7 @@ private void changePlayerRank(UUID toChange, PlayerType newRank) { + NameAPI.getCurrentName(toChange) + " has been " + demoteOrPromote(g.getCurrentRank(toChange), newRank, - false) + "d to " + getRankName(toChange)); + false) + "d to " + getRankName(toChange)); } else { p.sendMessage(ChatColor.RED + "You have lost permission to remove this player"); @@ -721,7 +721,7 @@ public void clicked(Player arg0) { private Clickable getAddBlackListClickable() { Clickable c; ItemStack is = blacklistStack(); - ISUtils.setName(is, ChatColor.GOLD + "Add player to blacklist"); + ItemAPI.setDisplayName(is, ChatColor.GOLD + "Add player to blacklist"); if (gm.hasAccess(g, p.getUniqueId(), PermissionType.getPermission("BLACKLIST"))) { c = new Clickable(is) { @@ -730,38 +730,27 @@ private Clickable getAddBlackListClickable() { public void clicked(final Player p) { p.sendMessage(ChatColor.GOLD + "Enter the name of the player to blacklist or \"cancel\" to exit this prompt"); ClickableInventory.forceCloseInventory(p); - Dialog dia = new Dialog(p, NameLayerPlugin.getInstance()) { + new Dialog(p, NameLayerPlugin.getInstance()) { @Override - public List onTabComplete(String word, - String[] msg) { - List names; - names = new LinkedList(); - for (Player p : Bukkit.getOnlinePlayers()) { - names.add(p.getName()); - } - if (word.equals("")) { - return names; - } - List result = new LinkedList(); - String comp = word.toLowerCase(); - for (String s : names) { - if (s.toLowerCase().startsWith(comp)) { - result.add(s); - } - } - return result; + public List onTabComplete(String word, String[] msg) { + List players = Bukkit.getOnlinePlayers().stream() + .filter(p -> !g.isMember(p.getUniqueId())) + .map(Player::getName) + .collect(Collectors.toList()); + players.add("cancel"); + + return StringUtil.copyPartialMatches(word, players, new ArrayList<>()); } @Override public void onReply(String[] message) { - if (message [0].equalsIgnoreCase("cancel")) { + if (message[0].equalsIgnoreCase("cancel")) { showScreen(); return; } if (gm.hasAccess(g, p.getUniqueId(), PermissionType.getPermission("BLACKLIST"))) { - boolean didSomething = false; for (String playerName : message) { UUID blackUUID = NameAPI .getUUID(playerName); @@ -772,8 +761,7 @@ public void onReply(String[] message) { } if (g.isMember(blackUUID)) { p.sendMessage(ChatColor.RED - + NameAPI - .getCurrentName(blackUUID) + + NameAPI.getCurrentName(blackUUID) + " is currently a member of this group and can't be blacklisted"); continue; } @@ -781,21 +769,18 @@ public void onReply(String[] message) { .getBlackList(); if (bl.isBlacklisted(g, blackUUID)) { p.sendMessage(ChatColor.RED - + NameAPI - .getCurrentName(blackUUID) + + NameAPI.getCurrentName(blackUUID) + " is already blacklisted"); continue; } - didSomething = true; NameLayerPlugin .log(Level.INFO, p.getName() + " blacklisted " - + NameAPI - .getCurrentName(blackUUID) + + NameAPI.getCurrentName(blackUUID) + " for group " + g.getName() - + "via gui"); + + " via gui"); bl.addBlacklistMember(g, blackUUID, true); p.sendMessage(ChatColor.GREEN + NameAPI.getCurrentName(blackUUID) @@ -812,7 +797,7 @@ public void onReply(String[] message) { } }; } else { - ISUtils.addLore(is, ChatColor.RED + ItemAPI.addLore(is, ChatColor.RED + "You don't have permission to do this"); c = new DecorationStack(is); } @@ -821,16 +806,16 @@ public void onReply(String[] message) { private Clickable getPasswordClickable() { Clickable c; - ItemStack is = new ItemStack(Material.SIGN); - ISUtils.setName(is, ChatColor.GOLD + "Add or change password"); + ItemStack is = new ItemStack(Material.OAK_SIGN); + ItemAPI.setDisplayName(is, ChatColor.GOLD + "Add or change password"); if (gm.hasAccess(g, p.getUniqueId(), PermissionType.getPermission("PASSWORD"))) { String pass = g.getPassword(); if (pass == null) { - ISUtils.addLore(is, ChatColor.AQUA + ItemAPI.addLore(is, ChatColor.AQUA + "This group doesn't have a password currently"); } else { - ISUtils.addLore(is, ChatColor.AQUA + ItemAPI.addLore(is, ChatColor.AQUA + "The current password is: " + ChatColor.YELLOW + pass); } c = new Clickable(is) { @@ -849,7 +834,7 @@ public void clicked(final Player p) { @Override public List onTabComplete( String wordCompleted, String[] fullMessage) { - return new LinkedList(); + return Collections.emptyList(); } @Override @@ -899,7 +884,7 @@ public void onReply(String[] message) { } }; } else { - ISUtils.addLore(is, ChatColor.RED + ItemAPI.addLore(is, ChatColor.RED + "You don't have permission to do this"); c = new DecorationStack(is); } @@ -908,7 +893,7 @@ public void onReply(String[] message) { private Clickable getPermOptionClickable() { ItemStack permStack = permsStack(); - ISUtils.setName(permStack, ChatColor.GOLD + ItemAPI.setDisplayName(permStack, ChatColor.GOLD + "View and manage group permissions"); Clickable permClickable; if (gm.hasAccess(g, p.getUniqueId(), @@ -922,7 +907,7 @@ public void clicked(Player arg0) { } }; } else { - ISUtils.addLore(permStack, ChatColor.RED + ItemAPI.addLore(permStack, ChatColor.RED + "You don't have permission", ChatColor.RED + "to do this"); permClickable = new DecorationStack(permStack); } @@ -931,7 +916,7 @@ public void clicked(Player arg0) { private Clickable getInvitePlayerClickable() { ItemStack inviteStack = new ItemStack(Material.COOKIE); - ISUtils.setName(inviteStack, ChatColor.GOLD + "Invite new member"); + ItemAPI.setDisplayName(inviteStack, ChatColor.GOLD + "Invite new member"); return new Clickable(inviteStack) { @Override @@ -944,17 +929,17 @@ public void clicked(Player arg0) { private Clickable getDefaultGroupStack() { Clickable c; ItemStack is = defaultStack(); - ISUtils.setName(is, ChatColor.GOLD + "Default group"); + ItemAPI.setDisplayName(is, ChatColor.GOLD + "Default group"); final String defGroup = gm.getDefaultGroup(p.getUniqueId()); if (defGroup != null && defGroup.equals(g.getName())) { - ISUtils.addLore(is, ChatColor.AQUA + ItemAPI.addLore(is, ChatColor.AQUA + "This group is your current default group"); c = new DecorationStack(is); } else { - ISUtils.addLore(is, ChatColor.AQUA + ItemAPI.addLore(is, ChatColor.AQUA + "Click to make this group your default group"); if (defGroup != null) { - ISUtils.addLore(is, ChatColor.BLUE + ItemAPI.addLore(is, ChatColor.BLUE + "Your current default group is : " + defGroup); } c = new Clickable(is) { @@ -984,8 +969,8 @@ public void clicked(Player p) { private Clickable getAdminStuffClickable() { ItemStack is = new ItemStack(Material.DIAMOND); - ISUtils.setName(is, ChatColor.GOLD + "Owner functions"); - Clickable c = new Clickable(is) { + ItemAPI.setDisplayName(is, ChatColor.GOLD + "Owner functions"); + return new Clickable(is) { @Override public void clicked(Player p) { @@ -994,7 +979,6 @@ public void clicked(Player p) { subGui.showScreen(); } }; - return c; } /** @@ -1003,9 +987,9 @@ public void clicked(Player p) { private Clickable getLeaveGroupClickable() { Clickable c; ItemStack is = new ItemStack(Material.IRON_DOOR); - ISUtils.setName(is, ChatColor.GOLD + "Leave group"); + ItemAPI.setDisplayName(is, ChatColor.GOLD + "Leave group"); if (g.isOwner(p.getUniqueId())) { - ISUtils.addLore(is, ChatColor.RED + "You cant leave this group,", + ItemAPI.addLore(is, ChatColor.RED + "You cant leave this group,", ChatColor.RED + "because you own it"); c = new DecorationStack(is); } else { @@ -1016,15 +1000,15 @@ public void clicked(Player p) { ClickableInventory confirmInv = new ClickableInventory(27, g.getName()); ItemStack info = new ItemStack(Material.PAPER); - ISUtils.setName(info, ChatColor.GOLD + "Leave group"); - ISUtils.addLore(info, ChatColor.RED + ItemAPI.setDisplayName(info, ChatColor.GOLD + "Leave group"); + ItemAPI.addLore(info, ChatColor.RED + "Are you sure that you want to", ChatColor.RED + "leave this group? You can not undo this!"); ItemStack yes = yesStack(); - ISUtils.setName(yes, + ItemAPI.setDisplayName(yes, ChatColor.GOLD + "Yes, leave " + g.getName()); ItemStack no = noStack(); - ISUtils.setName(no, + ItemAPI.setDisplayName(no, ChatColor.GOLD + "No, stay in " + g.getName()); confirmInv.setSlot(new Clickable(yes) { @@ -1067,8 +1051,8 @@ public void clicked(Player p) { private Clickable getInfoStack() { Clickable c; ItemStack is = new ItemStack(Material.PAPER); - ISUtils.setName(is, ChatColor.GOLD + "Stats for " + g.getName()); - ISUtils.addLore(is, + ItemAPI.setDisplayName(is, ChatColor.GOLD + "Stats for " + g.getName()); + ItemAPI.addLore(is, ChatColor.DARK_AQUA + "Your current rank: " + ChatColor.YELLOW + PlayerType.getNiceRankName(g.getPlayerType(p.getUniqueId()))); boolean hasGroupStatsPerm = gm.hasAccess(g, p.getUniqueId(), @@ -1076,47 +1060,47 @@ private Clickable getInfoStack() { if (gm.hasAccess(g, p.getUniqueId(), PermissionType.getPermission("MEMBERS")) || hasGroupStatsPerm) { - ISUtils.addLore( + ItemAPI.addLore( is, ChatColor.AQUA + String.valueOf(g - .getAllMembers(PlayerType.MEMBERS).size()) + .getAllMembers(PlayerType.MEMBERS).size()) + " members"); } if (gm.hasAccess(g, p.getUniqueId(), PermissionType.getPermission("MODS")) || hasGroupStatsPerm) { - ISUtils.addLore( + ItemAPI.addLore( is, ChatColor.AQUA + String.valueOf(g.getAllMembers(PlayerType.MODS) - .size()) + " mods"); + .size()) + " mods"); } if (gm.hasAccess(g, p.getUniqueId(), PermissionType.getPermission("ADMINS")) || hasGroupStatsPerm) { - ISUtils.addLore( + ItemAPI.addLore( is, ChatColor.AQUA + String.valueOf(g.getAllMembers(PlayerType.ADMINS) - .size()) + " admins"); + .size()) + " admins"); } if (gm.hasAccess(g, p.getUniqueId(), PermissionType.getPermission("OWNER")) || hasGroupStatsPerm) { - ISUtils.addLore( + ItemAPI.addLore( is, ChatColor.AQUA + String.valueOf(g.getAllMembers(PlayerType.OWNER) - .size()) + " owner"); + .size()) + " owner"); } if (hasGroupStatsPerm) { - ISUtils.addLore( + ItemAPI.addLore( is, ChatColor.DARK_AQUA + String.valueOf(g.getAllMembers().size()) + " total group members"); - ISUtils.addLore(is, ChatColor.DARK_AQUA + "Group owner: " + ItemAPI.addLore(is, ChatColor.DARK_AQUA + "Group owner: " + ChatColor.YELLOW + NameAPI.getCurrentName(g.getOwner())); } c = new DecorationStack(is); @@ -1126,12 +1110,11 @@ private Clickable getInfoStack() { /** * Utility to get a "nice" version of the rank the given player has in the * group this gui is based on - * - * @param uuid - * Player whose rank name should be checked + * + * @param uuid Player whose rank name should be checked * @return Rankname of the given player ready to be put into the gui or null - * if the given UUID was null or the player didn't have an explicit - * rank in the group + * if the given UUID was null or the player didn't have an explicit + * rank in the group */ private String getRankName(UUID uuid) { if (uuid == null) { @@ -1146,22 +1129,21 @@ private String getRankName(UUID uuid) { /** * Gets the permission needed to make changes to the given PlayerType - * - * @param pt - * PlayerType to get permission for + * + * @param pt PlayerType to get permission for * @return Permission belonging to the given PlayerType or null if the - * permission was NOT_BLACKLISTED or null + * permission was NOT_BLACKLISTED or null */ public static PermissionType getAccordingPermission(PlayerType pt) { switch (pt) { - case MEMBERS: - return PermissionType.getPermission("MEMBERS"); - case MODS: - return PermissionType.getPermission("MODS"); - case ADMINS: - return PermissionType.getPermission("ADMINS"); - case OWNER: - return PermissionType.getPermission("OWNER"); + case MEMBERS: + return PermissionType.getPermission("MEMBERS"); + case MODS: + return PermissionType.getPermission("MODS"); + case ADMINS: + return PermissionType.getPermission("ADMINS"); + case OWNER: + return PermissionType.getPermission("OWNER"); } return null; } @@ -1170,7 +1152,7 @@ public static PermissionType getAccordingPermission(PlayerType pt) { * Utility to determine whether the player is being promoted or demoted */ private static String demoteOrPromote(PlayerType oldRank, - PlayerType newRank, boolean upperCaseFirstLetter) { + PlayerType newRank, boolean upperCaseFirstLetter) { String res = PlayerType.getID(oldRank) <= PlayerType.getID(newRank) ? "promote" : "demote"; if (upperCaseFirstLetter) { @@ -1180,30 +1162,30 @@ private static String demoteOrPromote(PlayerType oldRank, } private List getRecursiveInheritedMembers(Group g) { - List clicks = new LinkedList(); + List clicks = new ArrayList<>(); if (g.hasSuperGroup()) { clicks.addAll(getRecursiveInheritedMembers(g.getSuperGroup())); } for (UUID uuid : g.getAllMembers()) { ItemStack is; switch (g.getPlayerType(uuid)) { - case MEMBERS: - is = new ItemStack(Material.LEATHER_CHESTPLATE); - break; - case MODS: - is = modStack(); - break; - case ADMINS: - is = new ItemStack(Material.IRON_CHESTPLATE); - break; - case OWNER: - is = new ItemStack(Material.DIAMOND_CHESTPLATE); - break; - default: - continue; + case MEMBERS: + is = new ItemStack(Material.LEATHER_CHESTPLATE); + break; + case MODS: + is = modStack(); + break; + case ADMINS: + is = new ItemStack(Material.IRON_CHESTPLATE); + break; + case OWNER: + is = new ItemStack(Material.DIAMOND_CHESTPLATE); + break; + default: + continue; } - ISUtils.setName(is, NameAPI.getCurrentName(uuid)); - ISUtils.addLore(is, ChatColor.AQUA + "Inherited " + ItemAPI.setDisplayName(is, NameAPI.getCurrentName(uuid)); + ItemAPI.addLore(is, ChatColor.AQUA + "Inherited " + getRankName(uuid) + " from " + g.getName()); clicks.add(new DecorationStack(is)); } @@ -1214,12 +1196,12 @@ private boolean hasPermissionToViewAnything() { return gm.hasAccess(g, p.getUniqueId(), PermissionType.getPermission("MEMBERS")) || gm.hasAccess(g, p.getUniqueId(), - PermissionType.getPermission("MODS")) + PermissionType.getPermission("MODS")) || gm.hasAccess(g, p.getUniqueId(), - PermissionType.getPermission("ADMINS")) + PermissionType.getPermission("ADMINS")) || gm.hasAccess(g, p.getUniqueId(), - PermissionType.getPermission("OWNER")) + PermissionType.getPermission("OWNER")) || gm.hasAccess(g, p.getUniqueId(), - PermissionType.getPermission("GROUPSTATS")); + PermissionType.getPermission("GROUPSTATS")); } } diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/MenuUtils.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/MenuUtils.java index c463b689..df429182 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/MenuUtils.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/MenuUtils.java @@ -1,15 +1,13 @@ package vg.civcraft.mc.namelayer.gui; -import java.util.LinkedList; +import java.util.ArrayList; import java.util.List; -import java.util.ListIterator; import java.util.UUID; import org.bukkit.ChatColor; -import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -import vg.civcraft.mc.civmodcore.itemHandling.ISUtils; +import vg.civcraft.mc.civmodcore.api.ItemAPI; public class MenuUtils { public static ItemStack toggleButton(boolean initState, String name, boolean canModify) { @@ -21,18 +19,18 @@ public static ItemStack toggleButton(boolean initState, String name, boolean can } if (initState) { if (canModify) { - ISUtils.addLore(is, ChatColor.GOLD + "Currently turned on", ChatColor.AQUA + "Click to turn off"); + ItemAPI.addLore(is, ChatColor.GOLD + "Currently turned on", ChatColor.AQUA + "Click to turn off"); } } else { if (canModify) { - ISUtils.addLore(is, ChatColor.GOLD + "Currently turned off", ChatColor.AQUA + "Click to turn on"); + ItemAPI.addLore(is, ChatColor.GOLD + "Currently turned off", ChatColor.AQUA + "Click to turn on"); } } if (!canModify) { - ISUtils.addLore(is, ChatColor.RED + "You don't have permission to", ChatColor.RED + "modify this setting"); + ItemAPI.addLore(is, ChatColor.RED + "You don't have permission to", ChatColor.RED + "modify this setting"); } - ISUtils.setName(is, name); + ItemAPI.setDisplayName(is, name); return is; } @@ -42,10 +40,13 @@ public static ItemStack getPlayerSkull(UUID uuid) { /** * Doesn't work + * + * @param lore the lore to split + * @return a split list of lores */ - public static List splitLore(String lore) { + public static List splitLore(String lore) { System.out.println("Splitting " + lore); - LinkedList splitLore = new LinkedList(); + List splitLore = new ArrayList<>(); int maxLineLength = 50; StringBuilder sb = new StringBuilder(); String [] split = lore.split(" "); diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/MergeGUI.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/MergeGUI.java index 10182fd5..9bf679f2 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/MergeGUI.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/MergeGUI.java @@ -9,10 +9,10 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; +import vg.civcraft.mc.civmodcore.api.ItemAPI; import vg.civcraft.mc.civmodcore.inventorygui.Clickable; import vg.civcraft.mc.civmodcore.inventorygui.ClickableInventory; import vg.civcraft.mc.civmodcore.inventorygui.DecorationStack; -import vg.civcraft.mc.civmodcore.itemHandling.ISUtils; import vg.civcraft.mc.namelayer.NameLayerPlugin; import vg.civcraft.mc.namelayer.command.commands.MergeGroups; import vg.civcraft.mc.namelayer.group.Group; @@ -33,17 +33,17 @@ public MergeGUI(Group g, Player p, AdminFunctionsGUI parent) { public void showScreen() { ClickableInventory ci = new ClickableInventory(27, g.getName()); ItemStack mergeThisIntoOtherStack = new ItemStack(Material.MINECART); - ISUtils.setName(mergeThisIntoOtherStack, ChatColor.GOLD + ItemAPI.setDisplayName(mergeThisIntoOtherStack, ChatColor.GOLD + "Merge this group into a different one"); - ISUtils.addLore( + ItemAPI.addLore( mergeThisIntoOtherStack, ChatColor.AQUA + "This action will transfer all members, reinforcements, snitches of this group to the one you chose next. " + "This group will be deleted in the process"); ItemStack mergeOtherIntoThisStack = mergeStack(); - ISUtils.setName(mergeOtherIntoThisStack, ChatColor.GOLD + ItemAPI.setDisplayName(mergeOtherIntoThisStack, ChatColor.GOLD + "Merge a different group into this one"); - ISUtils.addLore( + ItemAPI.addLore( mergeOtherIntoThisStack, ChatColor.AQUA + "This action will transfer all members, reinforcements and snitches of the group you chose next to this group. " @@ -66,7 +66,7 @@ public void clicked(Player arg0) { }, 15); // exit button ItemStack backToOverview = goBackStack(); - ISUtils.setName(backToOverview, ChatColor.GOLD + ItemAPI.setDisplayName(backToOverview, ChatColor.GOLD + "Go back to previous menu"); ci.setSlot(new Clickable(backToOverview) { @@ -99,7 +99,7 @@ private void showMergeGroupSelector() { continue; } ItemStack is = new ItemStack(Material.MAGMA_CREAM); - ISUtils.setName(is, ChatColor.GOLD + currentName); + ItemAPI.setDisplayName(is, ChatColor.GOLD + currentName); ci.setSlot(new Clickable(is) { @Override @@ -111,7 +111,7 @@ public void clicked(Player arg0) { // back button if (currentPage > 0) { ItemStack back = new ItemStack(Material.ARROW); - ISUtils.setName(back, ChatColor.GOLD + "Go to previous page"); + ItemAPI.setDisplayName(back, ChatColor.GOLD + "Go to previous page"); Clickable baCl = new Clickable(back) { @Override @@ -127,7 +127,7 @@ public void clicked(Player arg0) { // next button if ((45 * (currentPage + 1)) <= gName.size()) { ItemStack forward = new ItemStack(Material.ARROW); - ISUtils.setName(forward, ChatColor.GOLD + "Go to next page"); + ItemAPI.setDisplayName(forward, ChatColor.GOLD + "Go to next page"); Clickable forCl = new Clickable(forward) { @Override @@ -143,7 +143,7 @@ public void clicked(Player arg0) { // exit button ItemStack backToOverview = goBackStack(); - ISUtils.setName(backToOverview, ChatColor.GOLD + "Exit selection"); + ItemAPI.setDisplayName(backToOverview, ChatColor.GOLD + "Exit selection"); ci.setSlot(new Clickable(backToOverview) { @Override @@ -159,21 +159,21 @@ private void requestConfirmation(final String groupName) { String fromGroup = mergeIntoThisGroup ? groupName : g.getName(); String targetGroup = mergeIntoThisGroup ? g.getName() : groupName; ItemStack info = new ItemStack(Material.PAPER); - ISUtils.setName(info, ChatColor.GOLD + "Merge group"); - ISUtils.addLore(info, ChatColor.RED + ItemAPI.setDisplayName(info, ChatColor.GOLD + "Merge group"); + ItemAPI.addLore(info, ChatColor.RED + "Are you sure that you want to merge " + fromGroup + " into " + targetGroup + "? You can not undo this!"); - ISUtils.addLore( + ItemAPI.addLore( info, ChatColor.AQUA + "This will transfer all members, reinforcements, snitches etc. from " + fromGroup + " to " + targetGroup + ". " + fromGroup + " will be deleted in the process"); ItemStack yes = yesStack(); - ISUtils.setName(yes, ChatColor.GOLD + "Yes, merge " + fromGroup + ItemAPI.setDisplayName(yes, ChatColor.GOLD + "Yes, merge " + fromGroup + " into " + targetGroup); ItemStack no = noStack(); - ISUtils.setName(no, ChatColor.GOLD + "No, don't merge " + g.getName()); + ItemAPI.setDisplayName(no, ChatColor.GOLD + "No, don't merge " + g.getName()); confirmInv.setSlot(new Clickable(yes) { @Override diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/PermissionManageGUI.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/PermissionManageGUI.java index 972fa5b8..69665168 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/PermissionManageGUI.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/gui/PermissionManageGUI.java @@ -13,12 +13,12 @@ import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.LeatherArmorMeta; +import vg.civcraft.mc.civmodcore.api.ItemAPI; import vg.civcraft.mc.civmodcore.inventorygui.Clickable; import vg.civcraft.mc.civmodcore.inventorygui.ClickableInventory; import vg.civcraft.mc.civmodcore.inventorygui.DecorationStack; -import vg.civcraft.mc.civmodcore.itemHandling.ISUtils; -import vg.civcraft.mc.namelayer.NameLayerPlugin; import vg.civcraft.mc.namelayer.GroupManager.PlayerType; +import vg.civcraft.mc.namelayer.NameLayerPlugin; import vg.civcraft.mc.namelayer.group.Group; import vg.civcraft.mc.namelayer.permission.GroupPermission; import vg.civcraft.mc.namelayer.permission.PermissionType; @@ -59,7 +59,7 @@ public void showScreen() { produceSelectionClickable(Material.DIAMOND_CHESTPLATE, PlayerType.OWNER), 17); ItemStack backStack = new ItemStack(Material.ARROW); - ISUtils.setName(backStack, ChatColor.GOLD + ItemAPI.setDisplayName(backStack, ChatColor.GOLD + "Go back to member management"); ci.setSlot(new Clickable(backStack) { @@ -78,11 +78,11 @@ private Clickable produceSelectionClickable(Material mat, im.addItemFlags(ItemFlag.HIDE_ATTRIBUTES); is.setItemMeta(im); Clickable c; - ISUtils.setName(is, ChatColor.GOLD + "View and edit permissions for " + ItemAPI.setDisplayName(is, ChatColor.GOLD + "View and edit permissions for " + PlayerType.getNiceRankName(pType)); if (!gm.hasAccess(g, p.getUniqueId(), PermissionType.getPermission("LIST_PERMS"))) { - ISUtils.addLore(is, ChatColor.RED + "You are not allowed to list", + ItemAPI.addLore(is, ChatColor.RED + "You are not allowed to list", ChatColor.RED + "permissions for this group"); c = new DecorationStack(is); } else { @@ -119,7 +119,7 @@ private void showPermissionEditing(final PlayerType pType) { final boolean hasPerm = gp.hasPermission(pType, perm); if (hasPerm) { is = yesStack(); - ISUtils.addLore( + ItemAPI.addLore( is, ChatColor.DARK_AQUA + PlayerType.getNiceRankName(pType) @@ -127,20 +127,20 @@ private void showPermissionEditing(final PlayerType pType) { + "this permission"); } else { is = noStack(); - ISUtils.addLore( + ItemAPI.addLore( is, ChatColor.DARK_AQUA + PlayerType.getNiceRankName(pType) + "s currently don't have", ChatColor.DARK_AQUA + "this permission"); } - ISUtils.setName(is, perm.getName()); + ItemAPI.setDisplayName(is, perm.getName()); String desc = perm.getDescription(); if (desc != null) { - ISUtils.addLore(is, ChatColor.GREEN + desc); + ItemAPI.addLore(is, ChatColor.GREEN + desc); } if (canEdit) { - ISUtils.addLore(is, ChatColor.AQUA + "Click to toggle"); + ItemAPI.addLore(is, ChatColor.AQUA + "Click to toggle"); c = new Clickable(is) { @Override @@ -183,7 +183,7 @@ public void clicked(Player arg0) { if (currentPage > 0) { ItemStack back = new ItemStack(Material.ARROW); - ISUtils.setName(back, ChatColor.GOLD + "Go to previous page"); + ItemAPI.setDisplayName(back, ChatColor.GOLD + "Go to previous page"); Clickable baCl = new Clickable(back) { @Override @@ -199,7 +199,7 @@ public void clicked(Player arg0) { // next button if ((45 * (currentPage + 1)) <= clicks.size()) { ItemStack forward = new ItemStack(Material.ARROW); - ISUtils.setName(forward, ChatColor.GOLD + "Go to next page"); + ItemAPI.setDisplayName(forward, ChatColor.GOLD + "Go to next page"); Clickable forCl = new Clickable(forward) { @Override @@ -214,7 +214,7 @@ public void clicked(Player arg0) { } ItemStack backToOverview = goBackStack(); - ISUtils.setName(backToOverview, ChatColor.GOLD + "Go back"); + ItemAPI.setDisplayName(backToOverview, ChatColor.GOLD + "Go back"); ci.setSlot(new Clickable(backToOverview) { @Override diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/listeners/AssociationListener.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/listeners/AssociationListener.java index 2a1f66d0..3ba1e9ac 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/listeners/AssociationListener.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/listeners/AssociationListener.java @@ -9,6 +9,7 @@ import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerLoginEvent; + import vg.civcraft.mc.namelayer.NameAPI; import vg.civcraft.mc.namelayer.NameLayerPlugin; import vg.civcraft.mc.namelayer.database.AssociationList; diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/listeners/PlayerListener.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/listeners/PlayerListener.java index a4eec233..ff460478 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/listeners/PlayerListener.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/listeners/PlayerListener.java @@ -7,7 +7,6 @@ import java.util.UUID; import java.util.logging.Level; -import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/misc/NameCleanser.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/misc/NameCleanser.java index 12b35bf8..8424f3c3 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/misc/NameCleanser.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/misc/NameCleanser.java @@ -26,7 +26,7 @@ public static void load(ConfigurationSection config) { try { List badWords = config.getStringList("bad_words"); ConfigurationSection opts = config.getConfigurationSection("opts"); - List> options = new ArrayList>(); + List> options = new ArrayList<>(); for(String key : opts.getKeys(false)) { options.add(opts.getCharacterList(key)); } diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/misc/NameFetcher.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/misc/NameFetcher.java index 1553a7c4..1862a0ae 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/misc/NameFetcher.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/misc/NameFetcher.java @@ -1,9 +1,5 @@ package vg.civcraft.mc.namelayer.misc; -import com.google.common.collect.ImmutableList; -import org.json.simple.JSONObject; -import org.json.simple.parser.JSONParser; - import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; @@ -13,12 +9,17 @@ import java.util.UUID; import java.util.concurrent.Callable; +import com.google.common.collect.ImmutableList; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; + //All credit for this code to evilmidget38 //Original source: https://gist.github.com/evilmidget38/a5c971d2f2b2c3b3fb37 public class NameFetcher implements Callable> { private static final String PROFILE_URL = "https://sessionserver.mojang.com/session/minecraft/profile/"; - private final JSONParser jsonParser = new JSONParser(); + private final JsonParser jsonParser = new JsonParser(); private final List uuids; public NameFetcher(List uuids) { this.uuids = ImmutableList.copyOf(uuids); @@ -26,18 +27,18 @@ public NameFetcher(List uuids) { @Override public Map call() throws Exception { - Map uuidStringMap = new HashMap(); + Map uuidStringMap = new HashMap<>(); for (UUID uuid: uuids) { HttpURLConnection connection = (HttpURLConnection) new URL(PROFILE_URL+uuid.toString().replace("-", "")).openConnection(); - JSONObject response = (JSONObject) jsonParser.parse(new InputStreamReader(connection.getInputStream())); - String name = (String) response.get("name"); + JsonObject response = (JsonObject) jsonParser.parse(new InputStreamReader(connection.getInputStream())); + String name = response.get("name").getAsString(); if (name == null) { continue; } - String cause = (String) response.get("cause"); - String errorMessage = (String) response.get("errorMessage"); - if (cause != null && cause.length() > 0) { - throw new IllegalStateException(errorMessage); + JsonElement cause = response.get("cause"); + JsonElement errorMessage = response.get("errorMessage"); + if (cause != null && cause.toString().length() > 0) { + throw new IllegalStateException(errorMessage.getAsString()); } uuidStringMap.put(uuid, name); } diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/permission/GroupPermission.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/permission/GroupPermission.java index 83a55d88..823d5456 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/permission/GroupPermission.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/permission/GroupPermission.java @@ -1,6 +1,7 @@ package vg.civcraft.mc.namelayer.permission; -import java.util.LinkedList; +import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -24,16 +25,14 @@ private void loadPermsforGroup(){ perms = db.getPermissions(group.getName()); //to save ourselves from trouble later, we ensure that every perm type has at least an empty list for(PlayerType pType : PlayerType.values()) { - if (perms.get(pType) == null) { - perms.put(pType, new LinkedList()); - } + perms.computeIfAbsent(pType, k -> new ArrayList<>()); } } /** * Checks if a certain PlayerType has the given permission. DONT USE THIS DIRECTLY. Use GroupManager.hasAccess() instead! - * @param ptype- The PlayerType in question. - * @param type- The PermissionType to check for. - * @return + * @param playerType The PlayerType in question. + * @param perm The PermissionType to check for. + * @return return true if this type of player has this type of perm, false otherwise */ public boolean hasPermission(PlayerType playerType, PermissionType perm){ if (playerType == null || perm == null) { @@ -51,7 +50,7 @@ public boolean hasPermission(PlayerType playerType, PermissionType perm){ /** * Lists the permissions types for a given PlayerType for the specific GroupPermission. - * @param type- The PlayerType to check for. + * @param type The PlayerType to check for. * @return Returns a String representation of the permissions. Should be sent to the player in this form. */ public String listPermsforPlayerType(PlayerType type){ @@ -65,33 +64,31 @@ public String listPermsforPlayerType(PlayerType type){ } /** * Adds a PermissionType to a PlayerType. - * @param pType- The PlayerType. - * @param permType- The PermissionType. + * @param pType The PlayerType. + * @param permType The PermissionType. * @return Returns false if the PlayerType already has the permission. */ - public boolean addPermission(PlayerType ptype, PermissionType permtype){ - return addPermission(ptype,permtype,true); + public boolean addPermission(PlayerType pType, PermissionType permType){ + return addPermission(pType, permType, true); } public boolean addPermission(PlayerType pType, PermissionType permType, boolean savetodb){ if (perms.get(pType).contains(permType)) return false; List types = perms.get(pType); types.add(permType); - List toAdd = new LinkedList(); - toAdd.add(permType); if (savetodb){ - db.addPermission(group.getName(), pType.name(), toAdd); + db.addPermission(group.getName(), pType.name(), Collections.singletonList(permType)); } return true; } /** * Removes the PermissionType from a PlayerType. - * @param pType- The PlayerType to get the PermissionType removed from. - * @param permType- The PermissionType. + * @param pType The PlayerType to get the PermissionType removed from. + * @param permType The PermissionType. * @return Returns false if the PlayerType doesn't have that permission. */ - public boolean removePermission(PlayerType ptype, PermissionType permtype){ - return removePermission(ptype,permtype,true); + public boolean removePermission(PlayerType pType, PermissionType permType){ + return removePermission(pType,permType,true); } public boolean removePermission(PlayerType pType, PermissionType permType, boolean savetodb){ @@ -106,7 +103,7 @@ public boolean removePermission(PlayerType pType, PermissionType permType, boole } /** * Returns the first PlayerType with a specific permission. - * @param type- The PermissionType you are looking for. + * @param type The PermissionType you are looking for. * @return Returns the first PlayerType with the permission or false if none was found. */ public PlayerType getFirstWithPerm(PermissionType type){ diff --git a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/permission/PermissionType.java b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/permission/PermissionType.java index d9f6862c..5301dc3a 100644 --- a/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/permission/PermissionType.java +++ b/namelayer-spigot/src/main/java/vg/civcraft/mc/namelayer/permission/PermissionType.java @@ -1,8 +1,9 @@ package vg.civcraft.mc.namelayer.permission; +import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.HashMap; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -10,7 +11,6 @@ import org.bukkit.Bukkit; -import vg.civcraft.mc.namelayer.GroupManager; import vg.civcraft.mc.namelayer.GroupManager.PlayerType; import vg.civcraft.mc.namelayer.NameLayerPlugin; @@ -22,15 +22,15 @@ public class PermissionType { private static int maximumExistingId; public static void initialize() { - permissionByName = new HashMap(); - permissionById = new TreeMap(); + permissionByName = new HashMap<>(); + permissionById = new TreeMap<>(); maximumExistingId = 0; Map dbRegisteredPerms = NameLayerPlugin.getGroupManagerDao().getPermissionMapping(); for(Entry perm : dbRegisteredPerms.entrySet()) { int id = perm.getKey(); String name = perm.getValue(); maximumExistingId = Math.max(maximumExistingId, id); - internalRegisterPermission(id, name, new LinkedList<>(), null); + internalRegisterPermission(id, name, new ArrayList<>(), null); } registerNameLayerPermissions(); } @@ -43,19 +43,19 @@ public static PermissionType getPermission(int id) { return permissionById.get(id); } - public static void registerPermission(String name, List defaultPermLevels) { - registerPermission(name, defaultPermLevels, null); + public static PermissionType registerPermission(String name, List defaultPermLevels) { + return registerPermission(name, defaultPermLevels, null); } - public static void registerPermission(String name, List defaultPermLevels, String description) { + public static PermissionType registerPermission(String name, List defaultPermLevels, String description) { if (name == null ) { Bukkit.getLogger().severe("Could not register permission, name was null"); - return; + return null; } PermissionType existing = permissionByName.get(name); if (existing != null) { existing.update(defaultPermLevels, description); - return; + return existing; } //not in db yet int id = maximumExistingId + 1; @@ -65,6 +65,7 @@ public static void registerPermission(String name, List defaultPerm if (!defaultPermLevels.isEmpty()) { NameLayerPlugin.getGroupManagerDao().addNewDefaultPermission(defaultPermLevels, perm); } + return perm; } private static PermissionType internalRegisterPermission(int id, String name, List defaultPermLevels, String description) { @@ -79,54 +80,43 @@ public static Collection getAllPermissions() { } private static void registerNameLayerPermissions() { - LinkedList members = new LinkedList(); - LinkedList modAndAbove = new LinkedList(); - LinkedList adminAndAbove = new LinkedList(); - LinkedList owner = new LinkedList(); - LinkedList all = new LinkedList (); - members.add(PlayerType.MEMBERS); - modAndAbove.add(PlayerType.MODS); - modAndAbove.add(PlayerType.ADMINS); - modAndAbove.add(PlayerType.OWNER); - adminAndAbove.add(PlayerType.ADMINS); - adminAndAbove.add(PlayerType.OWNER); - owner.add(PlayerType.OWNER); - all.add(PlayerType.MEMBERS); - all.add(PlayerType.MODS); - all.add(PlayerType.ADMINS); - all.add(PlayerType.OWNER); + List members = Arrays.asList(PlayerType.MEMBERS); + List modAndAbove = Arrays.asList(PlayerType.MODS, PlayerType.ADMINS, PlayerType.OWNER); + List adminAndAbove = Arrays.asList(PlayerType.ADMINS, PlayerType.OWNER); + List owner = Arrays.asList(PlayerType.OWNER); + List all = Arrays.asList(PlayerType.MEMBERS, PlayerType.MODS, PlayerType.ADMINS, PlayerType.OWNER); + //clone the list every time so changing the list of one perm later doesn't affect other perms //allows adding/removing members - registerPermission("MEMBERS", (LinkedList )modAndAbove.clone(), "Allows inviting new members and removing existing members"); + registerPermission("MEMBERS", new ArrayList<>(modAndAbove), "Allows inviting new members and removing existing members"); //allows blacklisting/unblacklisting players and viewing the blacklist - registerPermission("BLACKLIST", (LinkedList )modAndAbove.clone(), "Allows viewing this group's blacklist, adding players to the blacklist " + registerPermission("BLACKLIST", new ArrayList<>(modAndAbove), "Allows viewing this group's blacklist, adding players to the blacklist " + "and removing players from the blacklist"); //allows adding/removing mods - registerPermission("MODS", (LinkedList )adminAndAbove.clone(), "Allows inviting new mods and removing existing mods"); + registerPermission("MODS", new ArrayList<>(adminAndAbove), "Allows inviting new mods and removing existing mods"); //allows adding/modifying a password for the group - registerPermission("PASSWORD", (LinkedList )adminAndAbove.clone(), "Allows viewing this groups password and changing or removing it"); + registerPermission("PASSWORD", new ArrayList<>(adminAndAbove), "Allows viewing this groups password and changing or removing it"); //allows to list the permissions for each permission group - registerPermission("LIST_PERMS", (LinkedList )adminAndAbove.clone(), "Allows viewing how permission for this group are set up"); + registerPermission("LIST_PERMS", new ArrayList<>(adminAndAbove), "Allows viewing how permission for this group are set up"); //allows to see general group stats - registerPermission("GROUPSTATS", (LinkedList )adminAndAbove.clone(), "Gives access to various group statistics such as member " + registerPermission("GROUPSTATS", new ArrayList<>(adminAndAbove), "Gives access to various group statistics such as member " + "counts by permission type, who owns the group etc."); //allows to add/remove admins - registerPermission("ADMINS", (LinkedList )owner.clone(), "Allows inviting new admins and removing existing admins"); + registerPermission("ADMINS", new ArrayList<>(owner), "Allows inviting new admins and removing existing admins"); //allows to add/remove owners - registerPermission("OWNER", (LinkedList )owner.clone(), "Allows inviting new owners and removing existing owners"); + registerPermission("OWNER", new ArrayList<>(owner), "Allows inviting new owners and removing existing owners"); //allows to modify the permissions for different permissions groups - registerPermission("PERMS", (LinkedList )owner.clone(), "Allows modifying permissions for this group"); + registerPermission("PERMS", new ArrayList<>(owner), "Allows modifying permissions for this group"); //allows deleting the group - registerPermission("DELETE", (LinkedList )owner.clone(), "Allows deleting this group"); + registerPermission("DELETE", new ArrayList<>(owner), "Allows deleting this group"); //allows merging the group with another one - registerPermission("MERGE", (LinkedList )owner.clone(), "Allows merging this group into another or merging another group into this one"); + registerPermission("MERGE", new ArrayList<>(owner), "Allows merging this group into another or merging another group into this one"); //allows linking this group to another - registerPermission("LINKING", (LinkedList )owner.clone(), "Allows linking this group to another group as a supergroup or a subgroup"); + registerPermission("LINKING", new ArrayList<>(owner), "Allows linking this group to another group as a supergroup or a subgroup"); //allows opening the gui - registerPermission("OPEN_GUI", (LinkedList )all.clone(), "Allows opening the GUI for this group"); - - + registerPermission("OPEN_GUI", new ArrayList<>(all), "Allows opening the GUI for this group"); + //perm level given to members when they join with a password registerPermission("JOIN_PASSWORD", members); } diff --git a/nms/interface/pom.xml b/nms/interface/pom.xml index 6956b185..23339c90 100644 --- a/nms/interface/pom.xml +++ b/nms/interface/pom.xml @@ -19,7 +19,7 @@ org.spigotmc spigot-api - 1.13.2-R0.1-SNAPSHOT + 1.14.4-R0.1-SNAPSHOT provided diff --git a/nms/v1_13_R2/src/main/java/vg/civcraft/mc/namelayer/misc/v1_13_R2/ProfileModifier.java b/nms/v1_13_R2/src/main/java/vg/civcraft/mc/namelayer/misc/v1_13_R2/ProfileModifier.java index 7d717879..fb0b14a8 100644 --- a/nms/v1_13_R2/src/main/java/vg/civcraft/mc/namelayer/misc/v1_13_R2/ProfileModifier.java +++ b/nms/v1_13_R2/src/main/java/vg/civcraft/mc/namelayer/misc/v1_13_R2/ProfileModifier.java @@ -41,13 +41,7 @@ public void setPlayerProfle(Player player, String name) { ((CraftServer)Bukkit.getServer()).getServer().getUserCache().a(prof); // end - } catch (NoSuchFieldException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (SecurityException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IllegalArgumentException e) { + } catch (NoSuchFieldException | SecurityException | IllegalArgumentException e) { // TODO Auto-generated catch block e.printStackTrace(); } diff --git a/nms/v1_14_R1/pom.xml b/nms/v1_14_R1/pom.xml new file mode 100644 index 00000000..e602c88a --- /dev/null +++ b/nms/v1_14_R1/pom.xml @@ -0,0 +1,32 @@ + + + 4.0.0 + + + vg.civcraft.mc.namelayer + namelayer-parent + 1.0.0 + ../../pom.xml + + + namelayer-nms-v1_14_R1 + 1.0.1 + jar + + + + vg.civcraft.mc.namelayer + namelayer-nms-interface + 1.0.1 + + + org.spigotmc + spigot + 1.14.4-R0.1-SNAPSHOT + provided + + + + diff --git a/nms/v1_14_R1/src/main/java/vg/civcraft/mc/namelayer/misc/v1_14_R1/MaterialMap.java b/nms/v1_14_R1/src/main/java/vg/civcraft/mc/namelayer/misc/v1_14_R1/MaterialMap.java new file mode 100644 index 00000000..d9dee028 --- /dev/null +++ b/nms/v1_14_R1/src/main/java/vg/civcraft/mc/namelayer/misc/v1_14_R1/MaterialMap.java @@ -0,0 +1,46 @@ +package vg.civcraft.mc.namelayer.misc.v1_14_R1; + +import vg.civcraft.mc.namelayer.misc.MaterialInterface; +import org.bukkit.Material; +import org.bukkit.inventory.ItemStack; + +public class MaterialMap implements MaterialInterface { + @Override + public Material getMaterial(MaterialInterface.Specific specific) { + switch (specific) { + case GREEN: + return Material.LIME_DYE; + case RED: + return Material.RED_DYE; + case BACK: + return Material.OAK_DOOR; + case MOD: + return Material.GOLDEN_CHESTPLATE; + case BLACKLIST: + return Material.LEAD; + case PERMS: + return Material.OAK_FENCE_GATE; + case MERGE: + return Material.CHEST_MINECART; + case DEFAULT: + return Material.BRICKS; + } + return null; + } + + @Override + public ItemStack getItemStack(MaterialInterface.Specific specific) { + switch (specific) { + case GREEN: + case RED: + case BACK: + case MOD: + case BLACKLIST: + case PERMS: + case MERGE: + case DEFAULT: + return new ItemStack(getMaterial(specific)); + } + return null; + } +} diff --git a/nms/v1_14_R1/src/main/java/vg/civcraft/mc/namelayer/misc/v1_14_R1/ProfileModifier.java b/nms/v1_14_R1/src/main/java/vg/civcraft/mc/namelayer/misc/v1_14_R1/ProfileModifier.java new file mode 100644 index 00000000..3f9c669a --- /dev/null +++ b/nms/v1_14_R1/src/main/java/vg/civcraft/mc/namelayer/misc/v1_14_R1/ProfileModifier.java @@ -0,0 +1,74 @@ +package vg.civcraft.mc.namelayer.misc.v1_14_R1; + +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.util.logging.Logger; + +import net.minecraft.server.v1_14_R1.EntityHuman; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.v1_14_R1.CraftServer; +import org.bukkit.craftbukkit.v1_14_R1.entity.CraftHumanEntity; +import org.bukkit.entity.Player; + +import vg.civcraft.mc.namelayer.misc.ProfileInterface; + +import com.mojang.authlib.GameProfile; + +public class ProfileModifier implements ProfileInterface { + + private static final Logger log = Logger.getLogger(ProfileModifier.class.getSimpleName()); + + @Override + public void setPlayerProfle(Player player, String name) { + String oldName = player.getName(); + if (name.length() > 16) { + log.info(String.format("The player %s (%s) was kicked from the server due to his " + + "name already existing but now becoming over 16 characters.", + name, player.getUniqueId().toString())); + } + try { + // start of getting the GameProfile + CraftHumanEntity craftHuman = (CraftHumanEntity) player; + EntityHuman human = craftHuman.getHandle(); + GameProfile prof = human.getProfile(); + // End + + // Start of adding a new name + Field nameUpdate = prof.getClass().getDeclaredField("name"); + + setFinalStatic(nameUpdate, name, prof); + + ((CraftServer)Bukkit.getServer()).getServer().getUserCache().a(prof); + // end + } catch (NoSuchFieldException e) { + e.printStackTrace(); + } catch (SecurityException e) { + e.printStackTrace(); + } catch (IllegalArgumentException e) { + e.printStackTrace(); + } + player.setDisplayName(name); + player.setPlayerListName(name); + player.setCustomName(name); + log.info(String.format("The player %s has had his name changed to %s.", oldName, name)); + } + + public void setFinalStatic(Field field, Object newValue, Object profile) { + GameProfile prof = (GameProfile) profile; + try { + field.setAccessible(true); + + // remove final modifier from field + Field modifiersField; + modifiersField = Field.class.getDeclaredField("modifiers"); + modifiersField.setAccessible(true); + modifiersField + .setInt(field, field.getModifiers() & ~Modifier.FINAL); + + field.set(prof, newValue); + } catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) { + e.printStackTrace(); + } + } +} diff --git a/pom.xml b/pom.xml index fbd26131..f5a9692f 100644 --- a/pom.xml +++ b/pom.xml @@ -13,14 +13,14 @@ nms/interface - nms/v1_13_R2 + nms/v1_14_R1 namelayer-spigot namelayer-bungee namelayer-all - 2.12.0 + 2.13.0 1.8 1.8 UTF-8 @@ -46,11 +46,6 @@ https://hub.spigotmc.org/nexus/content/repositories/snapshots - - bukkit - http://repo.bukkit.org/content/groups/public/ - - md_5-repo http://repo.md-5.net/content/repositories/public/