Skip to content

Commit a83ca09

Browse files
InnecticInnectic
committed
Generify permissify command
1 parent 06107d8 commit a83ca09

File tree

6 files changed

+99
-93
lines changed

6 files changed

+99
-93
lines changed

‎Spigot/src/main/java/me/innectic/permissify/spigot/commands/PermissifyCommand.java‎

Lines changed: 72 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -53,87 +53,86 @@ public boolean onCommand(CommandSender sender, Command command, String s, String
5353
return;
5454
}
5555
if (sender instanceof ConsoleCommandSender) {
56-
if (args.length < 2 || (args.length >= 2 && !args[0].equalsIgnoreCase("superadmin"))) {
57-
sendResponse(PermissifyConstants.CONSOLE_INVALID_COMMAND, sender);
56+
if (args.length >= 2 && args[0].equalsIgnoreCase("superadmin")) {
57+
Player player = Bukkit.getPlayer(args[1]);
58+
if (player == null) return;
59+
plugin.getPermissifyAPI().getDatabaseHandler().get().addSuperAdmin(player.getUniqueId());
5860
return;
5961
}
60-
Player player = Bukkit.getPlayer(args[1]);
61-
if (player == null) return;
62-
plugin.getPermissifyAPI().getDatabaseHandler().get().addSuperAdmin(player.getUniqueId());
63-
} else if (sender instanceof Player) {
64-
Player player = (Player) sender;
65-
if (!PermissionUtil.hasPermissionOrSuperAdmin(player, PermissifyConstants.PERMISSIFY_BASIC)) {
66-
player.sendMessage(ColorUtil.makeReadable(PermissifyConstants.INSUFFICIENT_PERMISSIONS));
67-
return;
62+
}
63+
64+
if (!PermissionUtil.hasPermissionOrSuperAdmin(sender, PermissifyConstants.PERMISSIFY_BASIC)) {
65+
sender.sendMessage(ColorUtil.makeReadable(PermissifyConstants.INSUFFICIENT_PERMISSIONS));
66+
return;
67+
}
68+
69+
if (args.length >= 1 && args[0].equalsIgnoreCase("help")) {
70+
int page = 0;
71+
if (args.length >= 2) {
72+
try {
73+
page = Integer.parseInt(args[1]);
74+
} catch (NumberFormatException ignored) {}
6875
}
69-
if (args.length >= 1 && args[0].equalsIgnoreCase("help")) {
70-
int page = 0;
71-
if (args.length >= 2) {
72-
try {
73-
page = Integer.parseInt(args[1]);
74-
} catch (NumberFormatException ignored) {}
75-
}
76-
page -= 1;
77-
if (page < 0) page = 0;
78-
sendHelp(player, page);
79-
return;
80-
} else if (args.length >= 1 && args[0].equalsIgnoreCase("cache")) {
81-
CommandResponse response = plugin.getCacheCommand().handleCache(sender, ArgumentUtil.getRemainingArgs(1, args));
82-
sendResponse(response, player);
76+
page -= 1;
77+
if (page < 0) page = 0;
78+
sendHelp(sender, page);
79+
return;
80+
} else if (args.length >= 1 && args[0].equalsIgnoreCase("cache")) {
81+
CommandResponse response = plugin.getCacheCommand().handleCache(sender, ArgumentUtil.getRemainingArgs(1, args));
82+
sendResponse(response, sender);
83+
return;
84+
}
85+
if (args.length < 2) {
86+
sendHelp(sender);
87+
return;
88+
}
89+
if (args[0].equalsIgnoreCase("group")) {
90+
CommandResponse response;
91+
if (args[1].equalsIgnoreCase("create") || args[1].equalsIgnoreCase("add"))
92+
response = plugin.getGroupCommand().handleAddGroup(sender, ArgumentUtil.getRemainingArgs(2, args));
93+
else if (args[1].equalsIgnoreCase("remove") || args[1].equalsIgnoreCase("delete"))
94+
response = plugin.getGroupCommand().handleDeleteGroup(sender, ArgumentUtil.getRemainingArgs(2, args));
95+
else if (args[1].equalsIgnoreCase("addpermission"))
96+
response = plugin.getGroupCommand().handlePermissionAdd(sender, ArgumentUtil.getRemainingArgs(2, args));
97+
else if (args[1].equalsIgnoreCase("removepermission"))
98+
response = plugin.getGroupCommand().handlePermissionRemove(sender, ArgumentUtil.getRemainingArgs(2, args));
99+
else if (args[1].equalsIgnoreCase("list"))
100+
response = plugin.getGroupCommand().handleListGroups(sender, ArgumentUtil.getRemainingArgs(2, args));
101+
else if (args[1].equalsIgnoreCase("listpermissions"))
102+
response = plugin.getGroupCommand().handleListPermissions(sender, ArgumentUtil.getRemainingArgs(2, args));
103+
else if (args[1].equalsIgnoreCase("default"))
104+
response = plugin.getGroupCommand().handleSetDefault(sender, ArgumentUtil.getRemainingArgs(2, args));
105+
else {
106+
sendHelp(sender);
83107
return;
84108
}
85-
if (args.length < 2) {
86-
sendHelp(player);
109+
sendResponse(response, sender);
110+
} else if (args[0].equalsIgnoreCase("player")) {
111+
CommandResponse response;
112+
if (args.length < 3) {
113+
sendResponse(PermissifyConstants.NOT_ENOUGH_ARGUMENTS_PLAYER, sender);
87114
return;
88115
}
89-
if (args[0].equalsIgnoreCase("group")) {
90-
CommandResponse response;
91-
if (args[1].equalsIgnoreCase("create") || args[1].equalsIgnoreCase("add"))
92-
response = plugin.getGroupCommand().handleAddGroup(player, ArgumentUtil.getRemainingArgs(2, args));
93-
else if (args[1].equalsIgnoreCase("remove") || args[1].equalsIgnoreCase("delete"))
94-
response = plugin.getGroupCommand().handleDeleteGroup(player, ArgumentUtil.getRemainingArgs(2, args));
95-
else if (args[1].equalsIgnoreCase("addpermission"))
96-
response = plugin.getGroupCommand().handlePermissionAdd(player, ArgumentUtil.getRemainingArgs(2, args));
97-
else if (args[1].equalsIgnoreCase("removepermission"))
98-
response = plugin.getGroupCommand().handlePermissionRemove(player, ArgumentUtil.getRemainingArgs(2, args));
99-
else if (args[1].equalsIgnoreCase("list"))
100-
response = plugin.getGroupCommand().handleListGroups(player, ArgumentUtil.getRemainingArgs(2, args));
101-
else if (args[1].equalsIgnoreCase("listpermissions"))
102-
response = plugin.getGroupCommand().handleListPermissions(player, ArgumentUtil.getRemainingArgs(2, args));
103-
else if (args[1].equalsIgnoreCase("default"))
104-
response = plugin.getGroupCommand().handleSetDefault(player, ArgumentUtil.getRemainingArgs(2, args));
105-
else {
106-
sendHelp(player);
107-
return;
108-
}
109-
sendResponse(response, sender);
110-
} else if (args[0].equalsIgnoreCase("player")) {
111-
CommandResponse response;
112-
if (args.length < 3) {
113-
sendResponse(PermissifyConstants.NOT_ENOUGH_ARGUMENTS_PLAYER, player);
114-
return;
115-
}
116-
if (args[1].equalsIgnoreCase("addpermission"))
117-
response = plugin.getPlayerCommand().handleAddPermission(sender, ArgumentUtil.getRemainingArgs(2, args));
118-
else if (args[1].equalsIgnoreCase("removepermission"))
119-
response = plugin.getPlayerCommand().handleRemovePermission(sender, ArgumentUtil.getRemainingArgs(2, args));
120-
else if (args[1].equalsIgnoreCase("addgroup"))
121-
response = plugin.getPlayerCommand().handleAddPlayerToGroup(sender, ArgumentUtil.getRemainingArgs(2, args));
122-
else if (args[1].equalsIgnoreCase("listpermissions"))
123-
response = plugin.getPlayerCommand().handleListPermissions(sender, ArgumentUtil.getRemainingArgs(2, args));
124-
else if (args[1].equalsIgnoreCase("listgroups"))
125-
response = plugin.getPlayerCommand().handleListGroups(sender, ArgumentUtil.getRemainingArgs(2, args));
126-
else if (args[1].equalsIgnoreCase("removegroup")) response = plugin.getPlayerCommand().handleRemovePlayerFromGroup(sender, ArgumentUtil.getRemainingArgs(2, args));
127-
else if (args[1].equalsIgnoreCase("setmain")) response = plugin.getPlayerCommand().handleSetMainGroup(sender, ArgumentUtil.getRemainingArgs(2, args));
128-
else {
129-
sendHelp(player);
130-
return;
131-
}
132-
sendResponse(response, player);
133-
} else if (args[0].equalsIgnoreCase("format")) {
134-
CommandResponse response = plugin.getFormatCommand().handleSetFormat(sender, ArgumentUtil.getRemainingArgs(1, args));
135-
sender.sendMessage(ColorUtil.makeReadable(response.getResponse()));
116+
if (args[1].equalsIgnoreCase("addpermission"))
117+
response = plugin.getPlayerCommand().handleAddPermission(sender, ArgumentUtil.getRemainingArgs(2, args));
118+
else if (args[1].equalsIgnoreCase("removepermission"))
119+
response = plugin.getPlayerCommand().handleRemovePermission(sender, ArgumentUtil.getRemainingArgs(2, args));
120+
else if (args[1].equalsIgnoreCase("addgroup"))
121+
response = plugin.getPlayerCommand().handleAddPlayerToGroup(sender, ArgumentUtil.getRemainingArgs(2, args));
122+
else if (args[1].equalsIgnoreCase("listpermissions"))
123+
response = plugin.getPlayerCommand().handleListPermissions(sender, ArgumentUtil.getRemainingArgs(2, args));
124+
else if (args[1].equalsIgnoreCase("listgroups"))
125+
response = plugin.getPlayerCommand().handleListGroups(sender, ArgumentUtil.getRemainingArgs(2, args));
126+
else if (args[1].equalsIgnoreCase("removegroup")) response = plugin.getPlayerCommand().handleRemovePlayerFromGroup(sender, ArgumentUtil.getRemainingArgs(2, args));
127+
else if (args[1].equalsIgnoreCase("setmain")) response = plugin.getPlayerCommand().handleSetMainGroup(sender, ArgumentUtil.getRemainingArgs(2, args));
128+
else {
129+
sendHelp(sender);
130+
return;
136131
}
132+
sendResponse(response, sender);
133+
} else if (args[0].equalsIgnoreCase("format")) {
134+
CommandResponse response = plugin.getFormatCommand().handleSetFormat(sender, ArgumentUtil.getRemainingArgs(1, args));
135+
sender.sendMessage(ColorUtil.makeReadable(response.getResponse()));
137136
}
138137
});
139138
return false;

‎Spigot/src/main/java/me/innectic/permissify/spigot/commands/permissify/CacheCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
public class CacheCommand {
4646

4747
public CommandResponse handleCache(CommandSender sender, String[] args) {
48-
if (!PermissionUtil.hasPermissionOrSuperAdmin((Player) sender, PermissifyConstants.PERMISSIFY_CACHE))
48+
if (!PermissionUtil.hasPermissionOrSuperAdmin(sender, PermissifyConstants.PERMISSIFY_CACHE))
4949
return new CommandResponse(PermissifyConstants.INSUFFICIENT_PERMISSIONS, false);
5050
if (args.length >= 1 && args[0].equalsIgnoreCase("purge")) return handleCachePurge(sender, ArgumentUtil.getRemainingArgs(1, args));
5151
if (!PermissifyMain.getInstance().getPermissifyAPI().getDatabaseHandler().isPresent())

‎Spigot/src/main/java/me/innectic/permissify/spigot/commands/permissify/FormatCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
public class FormatCommand {
4040

4141
public CommandResponse handleSetFormat(CommandSender sender, String[] args) {
42-
if (!PermissionUtil.hasPermissionOrSuperAdmin((Player) sender, PermissifyConstants.PERMISSIFY_FORMAT))
42+
if (!PermissionUtil.hasPermissionOrSuperAdmin(sender, PermissifyConstants.PERMISSIFY_FORMAT))
4343
return new CommandResponse(PermissifyConstants.INSUFFICIENT_PERMISSIONS, false);
4444
if (args.length < 1) return new CommandResponse(PermissifyConstants.NOT_ENOUGH_ARGUMENTS_SET_FORMAT, false);
4545
if (args[0].equalsIgnoreCase("chat")) return handleSetChatFormat(sender, ArgumentUtil.getRemainingArgs(1, args));

‎Spigot/src/main/java/me/innectic/permissify/spigot/commands/permissify/GroupCommand.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public class GroupCommand {
5959
*/
6060
public CommandResponse handleAddGroup(CommandSender sender, String[] args) {
6161
PermissifyMain plugin = PermissifyMain.getInstance();
62-
if (!PermissionUtil.hasPermissionOrSuperAdmin((Player) sender, PermissifyConstants.PERMISSIFY_GROUP_CREATE))
62+
if (!PermissionUtil.hasPermissionOrSuperAdmin(sender, PermissifyConstants.PERMISSIFY_GROUP_CREATE))
6363
return new CommandResponse(PermissifyConstants.INSUFFICIENT_PERMISSIONS, false);
6464
if (!plugin.getPermissifyAPI().getDatabaseHandler().isPresent())
6565
return new CommandResponse(PermissifyConstants.UNABLE_TO_CREATE.replace("<TYPE>", "group").replace("<REASON>", "No database handler."), false);
@@ -81,7 +81,7 @@ public CommandResponse handleAddGroup(CommandSender sender, String[] args) {
8181
public CommandResponse handleDeleteGroup(CommandSender sender, String[] args) {
8282
PermissifyMain plugin = PermissifyMain.getInstance();
8383
// Check permissions and arguments
84-
if (!PermissionUtil.hasPermissionOrSuperAdmin((Player) sender, PermissifyConstants.PERMISSIFY_GROUP_REMOVE))
84+
if (!PermissionUtil.hasPermissionOrSuperAdmin(sender, PermissifyConstants.PERMISSIFY_GROUP_REMOVE))
8585
return new CommandResponse(PermissifyConstants.INSUFFICIENT_PERMISSIONS, false);
8686
if (!plugin.getPermissifyAPI().getDatabaseHandler().isPresent())
8787
return new CommandResponse(PermissifyConstants.UNABLE_TO_REMOVE.replace("<TYPE>", "group").replace("<REASON>", "No database handler"), false);
@@ -95,7 +95,7 @@ public CommandResponse handlePermissionAdd(CommandSender sender, String[] args)
9595
PermissifyMain plugin = PermissifyMain.getInstance();
9696
if (!plugin.getPermissifyAPI().getDatabaseHandler().isPresent())
9797
return new CommandResponse(PermissifyConstants.UNABLE_TO_CREATE.replace("<TYPE>", "group").replace("<REASON>", "No database handler."), false);
98-
if (!PermissionUtil.hasPermissionOrSuperAdmin((Player) sender, PermissifyConstants.PERMISSIFY_GROUP_PERMISSION_ADD))
98+
if (!PermissionUtil.hasPermissionOrSuperAdmin(sender, PermissifyConstants.PERMISSIFY_GROUP_PERMISSION_ADD))
9999
return new CommandResponse(PermissifyConstants.INSUFFICIENT_PERMISSIONS, false);
100100
if (args.length < 2) return new CommandResponse(PermissifyConstants.NOT_ENOUGH_ARGUMENTS_GROUP_PERMISSION_ADD, false);
101101
boolean added = plugin.getPermissifyAPI().getDatabaseHandler().get().addGroupPermission(args[0], ArgumentUtil.getRemainingArgs(1, args));
@@ -116,7 +116,7 @@ public CommandResponse handlePermissionAdd(CommandSender sender, String[] args)
116116

117117
public CommandResponse handlePermissionRemove(CommandSender sender, String[] args) {
118118
PermissifyMain plugin = PermissifyMain.getInstance();
119-
if (!PermissionUtil.hasPermissionOrSuperAdmin((Player) sender, PermissifyConstants.PERMISSIFY_GROUP_PERMISSION_REMOVE))
119+
if (!PermissionUtil.hasPermissionOrSuperAdmin(sender, PermissifyConstants.PERMISSIFY_GROUP_PERMISSION_REMOVE))
120120
return new CommandResponse(PermissifyConstants.INSUFFICIENT_PERMISSIONS, false);
121121
if (!plugin.getPermissifyAPI().getDatabaseHandler().isPresent())
122122
return new CommandResponse(PermissifyConstants.UNABLE_TO_CREATE.replace("<TYPE>", "group").replace("<REASON>", "No database handler."), false);
@@ -140,7 +140,7 @@ public CommandResponse handlePermissionRemove(CommandSender sender, String[] arg
140140

141141
public CommandResponse handleListPermissions(CommandSender sender, String[] args) {
142142
PermissifyMain plugin = PermissifyMain.getInstance();
143-
if (!PermissionUtil.hasPermissionOrSuperAdmin((Player) sender, PermissifyConstants.PERMISSIFY_GROUP_PERMISSION_LIST))
143+
if (!PermissionUtil.hasPermissionOrSuperAdmin(sender, PermissifyConstants.PERMISSIFY_GROUP_PERMISSION_LIST))
144144
return new CommandResponse(PermissifyConstants.INSUFFICIENT_PERMISSIONS, false);
145145
if (!plugin.getPermissifyAPI().getDatabaseHandler().isPresent())
146146
return new CommandResponse(PermissifyConstants.UNABLE_TO_LIST.replace("<REASON>", "No database handler"), false);
@@ -155,7 +155,7 @@ public CommandResponse handleListPermissions(CommandSender sender, String[] args
155155

156156
public CommandResponse handleListGroups(CommandSender sender, String[] args) {
157157
PermissifyMain plugin = PermissifyMain.getInstance();
158-
if (!PermissionUtil.hasPermissionOrSuperAdmin((Player) sender, PermissifyConstants.PERMISSIFY_GROUP_LIST))
158+
if (!PermissionUtil.hasPermissionOrSuperAdmin(sender, PermissifyConstants.PERMISSIFY_GROUP_LIST))
159159
return new CommandResponse(PermissifyConstants.INSUFFICIENT_PERMISSIONS, false);
160160
if (!plugin.getPermissifyAPI().getDatabaseHandler().isPresent())
161161
return new CommandResponse(PermissifyConstants.UNABLE_TO_LIST.replace("<REASON>", "No database handler"), false);
@@ -166,7 +166,7 @@ public CommandResponse handleListGroups(CommandSender sender, String[] args) {
166166

167167
public CommandResponse handleSetDefault(CommandSender sender, String[] args) {
168168
PermissifyMain plugin = PermissifyMain.getInstance();
169-
if (!PermissionUtil.hasPermissionOrSuperAdmin((Player) sender, PermissifyConstants.PERMISSIFY_GROUP_DEFAULT))
169+
if (!PermissionUtil.hasPermissionOrSuperAdmin(sender, PermissifyConstants.PERMISSIFY_GROUP_DEFAULT))
170170
return new CommandResponse(PermissifyConstants.INSUFFICIENT_PERMISSIONS, false);
171171
if (!plugin.getPermissifyAPI().getDatabaseHandler().isPresent())
172172
return new CommandResponse(PermissifyConstants.UNABLE_TO_SET.replace("<REASON>", "No database handler"), false);

0 commit comments

Comments
 (0)