Skip to content

Commit 25b111b

Browse files
InnecticInnectic
authored
Merge pull request #39 from Innectic/overhaul/commands
Replace CommandResponse with raw strings
2 parents 086c585 + 276ec4e commit 25b111b

File tree

7 files changed

+213
-198
lines changed

7 files changed

+213
-198
lines changed

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

Lines changed: 0 additions & 38 deletions
This file was deleted.

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

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public boolean onCommand(CommandSender sender, Command command, String s, String
7878
sendHelp(sender, page);
7979
return;
8080
} else if (args.length >= 1 && args[0].equalsIgnoreCase("cache")) {
81-
CommandResponse response = plugin.getCacheCommand().handleCache(sender, ArgumentUtil.getRemainingArgs(1, args));
81+
String response = plugin.getCacheCommand().handleCache(sender, ArgumentUtil.getRemainingArgs(1, args));
8282
sendResponse(response, sender);
8383
return;
8484
}
@@ -87,7 +87,7 @@ public boolean onCommand(CommandSender sender, Command command, String s, String
8787
return;
8888
}
8989
if (args[0].equalsIgnoreCase("group")) {
90-
CommandResponse response;
90+
String response;
9191
if (args[1].equalsIgnoreCase("create") || args[1].equalsIgnoreCase("add"))
9292
response = plugin.getGroupCommand().handleAddGroup(sender, ArgumentUtil.getRemainingArgs(2, args));
9393
else if (args[1].equalsIgnoreCase("remove") || args[1].equalsIgnoreCase("delete"))
@@ -108,7 +108,7 @@ else if (args[1].equalsIgnoreCase("default"))
108108
}
109109
sendResponse(response, sender);
110110
} else if (args[0].equalsIgnoreCase("player")) {
111-
CommandResponse response;
111+
String response;
112112
if (args.length < 3) {
113113
sendResponse(PermissifyConstants.NOT_ENOUGH_ARGUMENTS_PLAYER, sender);
114114
return;
@@ -131,20 +131,16 @@ else if (args[1].equalsIgnoreCase("listgroups"))
131131
}
132132
sendResponse(response, sender);
133133
} else if (args[0].equalsIgnoreCase("format")) {
134-
CommandResponse response = plugin.getFormatCommand().handleSetFormat(sender, ArgumentUtil.getRemainingArgs(1, args));
135-
sender.sendMessage(ColorUtil.makeReadable(response.getResponse()));
134+
String response = plugin.getFormatCommand().handleSetFormat(sender, ArgumentUtil.getRemainingArgs(1, args));
135+
sender.sendMessage(ColorUtil.makeReadable(response));
136136
} else if (args[0].equalsIgnoreCase("profile")) {
137-
CommandResponse response = plugin.getProfileCommand().handleProfile(sender, ArgumentUtil.getRemainingArgs(1, args));
138-
sender.sendMessage(ColorUtil.makeReadable(response.getResponse()));
137+
String response = plugin.getProfileCommand().handleProfile(sender, ArgumentUtil.getRemainingArgs(1, args));
138+
sender.sendMessage(ColorUtil.makeReadable(response));
139139
} else sendHelp(sender);
140140
});
141141
return false;
142142
}
143143

144-
private void sendResponse(CommandResponse response, CommandSender source) {
145-
sendResponse(response.getResponse(), source);
146-
}
147-
148144
private void sendResponse(List<String> responses, CommandSender source) {
149145
responses.forEach(response -> sendResponse(response, source));
150146
}

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import me.innectic.permissify.api.group.group.PermissionGroup;
3030
import me.innectic.permissify.api.util.ArgumentUtil;
3131
import me.innectic.permissify.spigot.PermissifyMain;
32-
import me.innectic.permissify.spigot.commands.CommandResponse;
3332
import me.innectic.permissify.spigot.utils.PermissionUtil;
3433
import org.bukkit.Bukkit;
3534
import org.bukkit.command.CommandSender;
@@ -43,25 +42,27 @@
4342
*/
4443
public class CacheCommand {
4544

46-
public CommandResponse handleCache(CommandSender sender, String[] args) {
45+
public String handleCache(CommandSender sender, String[] args) {
4746
if (!PermissionUtil.hasPermissionOrSuperAdmin(sender, PermissifyConstants.PERMISSIFY_CACHE))
48-
return new CommandResponse(PermissifyConstants.INSUFFICIENT_PERMISSIONS, false);
47+
return PermissifyConstants.INSUFFICIENT_PERMISSIONS;
48+
4949
if (args.length >= 1 && args[0].equalsIgnoreCase("purge")) return handleCachePurge(sender, ArgumentUtil.getRemainingArgs(1, args));
5050
if (!PermissifyMain.getInstance().getPermissifyAPI().getDatabaseHandler().isPresent())
51-
return new CommandResponse(PermissifyConstants.UNABLE_OTHER.replace("<REASON>", "No database handler"), false);
51+
return PermissifyConstants.UNABLE_OTHER.replace("<REASON>", "No database handler");
52+
5253
// Show information about the current cache
5354
DatabaseHandler handler = PermissifyMain.getInstance().getPermissifyAPI().getDatabaseHandler().get();
54-
String response = PermissifyConstants.CACHE_INFORMATION.replace("<GROUPS>", Integer.toString(handler.getCachedGroups().size()))
55+
return PermissifyConstants.CACHE_INFORMATION.replace("<GROUPS>", Integer.toString(handler.getCachedGroups().size()))
5556
.replace("<PERMISSIONS>", Integer.toString(handler.getCachedPermissions().size()))
5657
.replace("<DEFAULT>", handler.getDefaultGroup().map(PermissionGroup::getName).orElse(PermissifyConstants.EMPTY_DEFAULT_GROUP_NAME));
57-
return new CommandResponse(response, false);
5858
}
5959

60-
private CommandResponse handleCachePurge(CommandSender sender, String[] args) {
60+
private String handleCachePurge(CommandSender sender, String[] args) {
6161
if (!PermissifyMain.getInstance().getPermissifyAPI().getDatabaseHandler().isPresent())
62-
return new CommandResponse(PermissifyConstants.UNABLE_OTHER.replace("<REASON>", "No database handler"), false);
62+
return PermissifyConstants.UNABLE_OTHER.replace("<REASON>", "No database handler");
63+
6364
PermissifyMain.getInstance().getPermissifyAPI().getDatabaseHandler().get().reload(Bukkit.getOnlinePlayers().stream().map(Player::getUniqueId).collect(Collectors.toList()));
6465
Bukkit.getScheduler().runTaskAsynchronously(PermissifyMain.getInstance(), () -> Bukkit.getOnlinePlayers().forEach(PermissionUtil::applyPermissions));
65-
return new CommandResponse(PermissifyConstants.CACHE_PURGED, true);
66+
return PermissifyConstants.CACHE_PURGED;
6667
}
6768
}

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,57 +27,57 @@
2727
import me.innectic.permissify.api.PermissifyConstants;
2828
import me.innectic.permissify.api.util.ArgumentUtil;
2929
import me.innectic.permissify.spigot.PermissifyMain;
30-
import me.innectic.permissify.spigot.commands.CommandResponse;
3130
import me.innectic.permissify.spigot.utils.PermissionUtil;
3231
import org.bukkit.command.CommandSender;
33-
import org.bukkit.entity.Player;
3432

3533
/**
3634
* @author Innectic
3735
* @since 7/2/2017
3836
*/
3937
public class FormatCommand {
4038

41-
public CommandResponse handleSetFormat(CommandSender sender, String[] args) {
39+
public String handleSetFormat(CommandSender sender, String[] args) {
4240
if (!PermissionUtil.hasPermissionOrSuperAdmin(sender, PermissifyConstants.PERMISSIFY_FORMAT))
43-
return new CommandResponse(PermissifyConstants.INSUFFICIENT_PERMISSIONS, false);
44-
if (args.length < 1) return new CommandResponse(PermissifyConstants.NOT_ENOUGH_ARGUMENTS_SET_FORMAT, false);
41+
return PermissifyConstants.INSUFFICIENT_PERMISSIONS;
42+
43+
if (args.length < 1) return PermissifyConstants.NOT_ENOUGH_ARGUMENTS_SET_FORMAT;
4544
if (args[0].equalsIgnoreCase("chat")) return handleSetChatFormat(sender, ArgumentUtil.getRemainingArgs(1, args));
4645
else if (args[0].equalsIgnoreCase("whisper")) return handleWhisperFormat(sender, ArgumentUtil.getRemainingArgs(1, args));
4746
else if (args[0].equalsIgnoreCase("enable")) return handleEnableFormat(sender, ArgumentUtil.getRemainingArgs(1, args));
4847
else if (args[0].equalsIgnoreCase("disable")) return handleDisableFormat(sender, ArgumentUtil.getRemainingArgs(1, args));
49-
return new CommandResponse(PermissifyConstants.INVALID_ARGUMENT.replace("<ARGUMENT>", args[0]), true);
48+
49+
return PermissifyConstants.INVALID_ARGUMENT.replace("<ARGUMENT>", args[0]);
5050
}
5151

52-
private CommandResponse handleSetChatFormat(CommandSender sender, String[] args) {
52+
private String handleSetChatFormat(CommandSender sender, String[] args) {
5353
if (!PermissifyMain.getInstance().getPermissifyAPI().getDatabaseHandler().isPresent())
54-
return new CommandResponse(PermissifyConstants.UNABLE_TO_SET.replace("<REASON>", "No database handler"), false);
55-
if (args.length < 1) return new CommandResponse(PermissifyConstants.NOT_ENOUGH_ARGUMENTS_SET_FORMAT, false);
54+
return PermissifyConstants.UNABLE_TO_SET.replace("<REASON>", "No database handler");
55+
if (args.length < 1) return PermissifyConstants.NOT_ENOUGH_ARGUMENTS_SET_FORMAT;
5656
String format = String.join(" ", args).trim();
5757
PermissifyMain.getInstance().getPermissifyAPI().getDatabaseHandler().get().setChatFormat(format);
58-
return new CommandResponse(PermissifyConstants.FORMATTER_SET.replace("<FORMATTER>", "chat"), true);
58+
return PermissifyConstants.FORMATTER_SET.replace("<FORMATTER>", "chat");
5959
}
6060

61-
private CommandResponse handleWhisperFormat(CommandSender sender, String[] args) {
61+
private String handleWhisperFormat(CommandSender sender, String[] args) {
6262
if (!PermissifyMain.getInstance().getPermissifyAPI().getDatabaseHandler().isPresent())
63-
return new CommandResponse(PermissifyConstants.UNABLE_TO_SET.replace("<REASON>", "No database handler"), false);
64-
if (args.length < 1) return new CommandResponse(PermissifyConstants.NOT_ENOUGH_ARGUMENTS_SET_FORMAT, false);
63+
return PermissifyConstants.UNABLE_TO_SET.replace("<REASON>", "No database handler");
64+
if (args.length < 1) return PermissifyConstants.NOT_ENOUGH_ARGUMENTS_SET_FORMAT;
6565
String format = String.join(" ", args).trim();
6666
PermissifyMain.getInstance().getPermissifyAPI().getDatabaseHandler().get().setWhisperFormat(format);
67-
return new CommandResponse(PermissifyConstants.FORMATTER_SET.replace("<FORMATTER>", "whisper"), true);
67+
return PermissifyConstants.FORMATTER_SET.replace("<FORMATTER>", "whisper");
6868
}
6969

70-
private CommandResponse handleDisableFormat(CommandSender sender, String[] args) {
70+
private String handleDisableFormat(CommandSender sender, String[] args) {
7171
PermissifyMain.getInstance().getConfig().set("handleChat", false);
7272
PermissifyMain.getInstance().saveConfig();
7373
PermissifyMain.getInstance().setHandleChat(false);
74-
return new CommandResponse(PermissifyConstants.TOGGLED_CHAT_HANDLE.replace("<STATE>", "Disabled"), true);
74+
return PermissifyConstants.TOGGLED_CHAT_HANDLE.replace("<STATE>", "Disabled");
7575
}
7676

77-
private CommandResponse handleEnableFormat(CommandSender sender, String[] args) {
77+
private String handleEnableFormat(CommandSender sender, String[] args) {
7878
PermissifyMain.getInstance().getConfig().set("handleChat", true);
7979
PermissifyMain.getInstance().saveConfig();
8080
PermissifyMain.getInstance().setHandleChat(true);
81-
return new CommandResponse(PermissifyConstants.TOGGLED_CHAT_HANDLE.replace("<STATE>", "Enabled"), true);
81+
return PermissifyConstants.TOGGLED_CHAT_HANDLE.replace("<STATE>", "Enabled");
8282
}
8383
}

0 commit comments

Comments
 (0)