mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2025-12-22 11:54:39 +01:00
Admin cmds, perms and descriptions for all cmds +
Additonal stuff: Fixed + refactored help command. Removed 'Usage: ' from all commands. Created 'player.hasPermission(permission)' function. Created default for Usage annotation. Created hashmap version of 'getHandlers' and renamed the original to getHandlersAsList()
This commit is contained in:
Benjamin Elsdon
@@ -1,10 +1,15 @@
|
||||
package emu.grasscutter.commands;
|
||||
|
||||
import com.mongodb.internal.connection.CommandHelper;
|
||||
import emu.grasscutter.Grasscutter;
|
||||
import emu.grasscutter.database.DatabaseHelper;
|
||||
import emu.grasscutter.game.Account;
|
||||
import emu.grasscutter.game.GenshinPlayer;
|
||||
import emu.grasscutter.server.packet.send.PacketSceneKickPlayerRsp;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@@ -12,7 +17,7 @@ import java.util.stream.Collectors;
|
||||
* A container for server-related commands.
|
||||
*/
|
||||
public final class ServerCommands {
|
||||
@Command(label = "reload", usage = "Usage: reload")
|
||||
@Command(label = "reload", usage = "reload", description = "Reload server config", permission = "server.reload")
|
||||
public static class ReloadCommand implements CommandHandler {
|
||||
|
||||
@Override
|
||||
@@ -25,12 +30,78 @@ public final class ServerCommands {
|
||||
|
||||
@Override
|
||||
public void execute(GenshinPlayer player, List<String> args) {
|
||||
CommandHandler.sendMessage(player, "Reloading config.");
|
||||
this.execute(args);
|
||||
CommandHandler.sendMessage(player, "Reload complete.");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Command(label = "kick", usage = "kick <player>", description = "Kicks the specified player from the server (WIP)", permission = "server.kick")
|
||||
public static class KickCommand implements CommandHandler {
|
||||
@Override
|
||||
public void execute(List<String> args) {
|
||||
int target = Integer.parseInt(args.get(0));
|
||||
String message = String.join(" ", args.subList(1, args.size()));
|
||||
|
||||
GenshinPlayer targetPlayer = Grasscutter.getGameServer().getPlayerById(target);
|
||||
if(targetPlayer == null) {
|
||||
CommandHandler.sendMessage(null, "Player not found."); return;
|
||||
}
|
||||
|
||||
targetPlayer.sendPacket(new PacketSceneKickPlayerRsp(targetPlayer.getId()));
|
||||
//targetPlayer.getSession().close();
|
||||
}
|
||||
}
|
||||
|
||||
@Command(label = "stop", usage = "stop", description = "Stops the server", permission = "server.stop")
|
||||
public static class StopCommand implements CommandHandler {
|
||||
@Override
|
||||
public void execute(List<String> args) {
|
||||
Grasscutter.getLogger().info("Server shutting down...");
|
||||
for (GenshinPlayer p : Grasscutter.getGameServer().getPlayers().values()) {
|
||||
p.dropMessage("Server shutting down...");
|
||||
}
|
||||
|
||||
System.exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
@Command(label = "broadcast", aliases = {"b"},
|
||||
usage = "broadcast <message>", description = "Sends a message to all the players", permission = "server.broadcast")
|
||||
public static class BroadcastCommand implements CommandHandler {
|
||||
@Override
|
||||
public void execute(List<String> args) {
|
||||
if(args.size() < 1) {
|
||||
CommandHandler.sendMessage(null, "Usage: broadcast <message>"); return;
|
||||
}
|
||||
|
||||
String message = String.join(" ", args.subList(0, args.size()));
|
||||
|
||||
for (GenshinPlayer p : Grasscutter.getGameServer().getPlayers().values()) {
|
||||
p.dropMessage(message);
|
||||
}
|
||||
|
||||
CommandHandler.sendMessage(null, "Message sent.");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute(GenshinPlayer player, List<String> args) {
|
||||
if(args.size() < 1) {
|
||||
CommandHandler.sendMessage(player, "Usage: broadcast <message>"); return;
|
||||
}
|
||||
|
||||
String message = String.join(" ", args.subList(0, args.size()));
|
||||
|
||||
for (GenshinPlayer p : Grasscutter.getGameServer().getPlayers().values()) {
|
||||
p.dropMessage(message);
|
||||
}
|
||||
|
||||
CommandHandler.sendMessage(player, "Message sent.");
|
||||
}
|
||||
}
|
||||
|
||||
@Command(label = "sendmessage", aliases = {"sendmsg", "msg"},
|
||||
usage = "Usage: sendmessage <player> <message>")
|
||||
usage = "sendmessage <player> <message>", description = "Sends a message to a player")
|
||||
public static class SendMessageCommand implements CommandHandler {
|
||||
|
||||
@Override
|
||||
@@ -79,8 +150,8 @@ public final class ServerCommands {
|
||||
}
|
||||
|
||||
@Command(label = "account",
|
||||
usage = "Usage: account <create|delete> <username> [uid]",
|
||||
execution = Command.Execution.CONSOLE)
|
||||
usage = "account <create|delete> <username> [uid]",
|
||||
description = "Modify user accounts", execution = Command.Execution.CONSOLE)
|
||||
public static class AccountCommand implements CommandHandler {
|
||||
|
||||
@Override
|
||||
@@ -124,8 +195,8 @@ public final class ServerCommands {
|
||||
}
|
||||
|
||||
@Command(label = "permission",
|
||||
usage = "Usage: permission <add|remove> <username> <permission>",
|
||||
execution = Command.Execution.CONSOLE)
|
||||
usage = "permission <add|remove> <username> <permission>",
|
||||
description = "Grants or removes a permission for a user", permission = "*")
|
||||
public static class PermissionCommand implements CommandHandler {
|
||||
|
||||
@Override
|
||||
@@ -164,50 +235,93 @@ public final class ServerCommands {
|
||||
}
|
||||
|
||||
@Command(label = "help",
|
||||
usage = "Usage: help [command]")
|
||||
usage = "help [command]", description = "Sends the help message or shows information about a specified command")
|
||||
public static class HelpCommand implements CommandHandler {
|
||||
|
||||
@Override
|
||||
public void execute(List<String> args) {
|
||||
List<CommandHandler> handlers = CommandMap.getInstance().getHandlers();
|
||||
List<Command> annotations = handlers.stream()
|
||||
.map(handler -> handler.getClass().getAnnotation(Command.class))
|
||||
.collect(Collectors.toList());
|
||||
|
||||
if(args.size() < 1) {
|
||||
StringBuilder builder = new StringBuilder("Available commands:\n");
|
||||
annotations.forEach(annotation -> builder.append(annotation.usage()).append("\n"));
|
||||
CommandHandler.sendMessage(null, builder.toString());
|
||||
} else {
|
||||
String command = args.get(0);
|
||||
CommandHandler handler = CommandMap.getInstance().getHandler(command);
|
||||
if(handler == null) {
|
||||
CommandHandler.sendMessage(null, "Command not found."); return;
|
||||
}
|
||||
|
||||
Command annotation = handler.getClass().getAnnotation(Command.class);
|
||||
CommandHandler.sendMessage(null, annotation.usage());
|
||||
}
|
||||
this.execute(null, args);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute(GenshinPlayer player, List<String> args) {
|
||||
List<CommandHandler> handlers = CommandMap.getInstance().getHandlers();
|
||||
List<Command> annotations = handlers.stream()
|
||||
.map(handler -> handler.getClass().getAnnotation(Command.class))
|
||||
.collect(Collectors.toList());
|
||||
|
||||
if(args.size() < 1) {
|
||||
annotations.forEach(annotation -> player.dropMessage(annotation.usage()));
|
||||
HashMap<String, CommandHandler> handlers = CommandMap.getInstance().getHandlers();
|
||||
List<Command> annotations = new ArrayList<Command>();
|
||||
for(String key : handlers.keySet()) {
|
||||
Command annotation = handlers.get(key).getClass().getAnnotation(Command.class);
|
||||
|
||||
if(!Arrays.asList(annotation.aliases()).contains(key)) {
|
||||
if(player != null && annotation.permission() != "" && !player.getAccount().hasPermission(annotation.permission())) continue;
|
||||
annotations.add(annotation);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
SendAllHelpMessage(player, annotations);
|
||||
} else {
|
||||
String command = args.get(0);
|
||||
CommandHandler handler = CommandMap.getInstance().getHandler(command);
|
||||
StringBuilder builder = new StringBuilder(player == null ? "\nHelp - " : "Help - ").append(command).append(": \n");
|
||||
if(handler == null) {
|
||||
CommandHandler.sendMessage(player, "Command not found."); return;
|
||||
builder.append("No command found.");
|
||||
} else {
|
||||
Command annotation = handler.getClass().getAnnotation(Command.class);
|
||||
|
||||
builder.append(" ").append(annotation.description()).append("\n");
|
||||
builder.append(" Usage: ").append(annotation.usage());
|
||||
if(annotation.aliases().length >= 1) {
|
||||
builder.append("\n").append(" Aliases: ");
|
||||
for (String alias : annotation.aliases()) {
|
||||
builder.append(alias).append(" ");
|
||||
}
|
||||
}
|
||||
if(player != null && annotation.permission() != "" && !player.getAccount().hasPermission(annotation.permission())) {
|
||||
builder.append("\n Warning: You do not have permission to run this command.");
|
||||
}
|
||||
}
|
||||
|
||||
Command annotation = handler.getClass().getAnnotation(Command.class);
|
||||
CommandHandler.sendMessage(player, annotation.usage());
|
||||
CommandHandler.sendMessage(player, builder.toString());
|
||||
}
|
||||
}
|
||||
|
||||
void SendAllHelpMessage(GenshinPlayer player, List<Command> annotations) {
|
||||
if(player == null) {
|
||||
StringBuilder builder = new StringBuilder("\nAvailable commands:\n");
|
||||
annotations.forEach(annotation -> {
|
||||
if (annotation.execution() != (player == null ? Command.Execution.PLAYER : Command.Execution.CONSOLE)) {
|
||||
builder.append(annotation.label()).append("\n");
|
||||
builder.append(" ").append(annotation.description()).append("\n");
|
||||
builder.append(" Usage: ").append(annotation.usage());
|
||||
if (annotation.aliases().length >= 1) {
|
||||
builder.append("\n").append(" Aliases: ");
|
||||
for (String alias : annotation.aliases()) {
|
||||
builder.append(alias).append(" ");
|
||||
}
|
||||
}
|
||||
|
||||
builder.append("\n");
|
||||
}
|
||||
});
|
||||
|
||||
CommandHandler.sendMessage(null, builder.toString());
|
||||
} else {
|
||||
CommandHandler.sendMessage(player, "Available commands:");
|
||||
annotations.forEach(annotation -> {
|
||||
if (annotation.execution() != (player == null ? Command.Execution.PLAYER : Command.Execution.CONSOLE)) {
|
||||
StringBuilder builder = new StringBuilder(annotation.label()).append("\n");
|
||||
builder.append(" ").append(annotation.description()).append("\n");
|
||||
builder.append(" Usage: ").append(annotation.usage());
|
||||
if (annotation.aliases().length >= 1) {
|
||||
builder.append("\n").append(" Aliases: ");
|
||||
for (String alias : annotation.aliases()) {
|
||||
builder.append(alias).append(" ");
|
||||
}
|
||||
}
|
||||
|
||||
CommandHandler.sendMessage(player, builder.toString());
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user