Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-16 08:56:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change commands to use new usage message method.

Browse Source
This commit is contained in:
AnimeGitB
2022-07-21 21:05:23 +09:30
committed by Luke H-W
parent 2cfbe78184
commit 104e04f70a
34 changed files with 89 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/emu/grasscutter/auth/DefaultAuthenticators.java
View File

@@ -163,7 +163,7 @@ public final class DefaultAuthenticators {
} else {
successfulLogin = false;
loggerMessage = translate("messages.dispatch.account.login_password_storage_error", address);
responseMessage = translate("password_storage_error");
responseMessage = translate("messages.dispatch.account.password_storage_error");
}
} else {
loggerMessage = translate("messages.dispatch.account.account_login_exist_error", address);

1
src/main/java/emu/grasscutter/command/CommandHandler.java
View File

@@ -68,7 +68,6 @@ public interface CommandHandler {
default String getDescriptionString(Player player) {
Command annotation = this.getClass().getAnnotation(Command.class);
String key = "commands.%s.description".formatted(annotation.label());
// TODO: fallback to "commands.generic.no_description_specified"
return translate(player, key);
}

3
src/main/java/emu/grasscutter/command/CommandMap.java
View File

@@ -35,6 +35,7 @@ public final class CommandMap {
*/
public CommandMap registerCommand(String label, CommandHandler command) {
Grasscutter.getLogger().debug("Registered command: " + label);
label = label.toLowerCase();
// Get command data.
Command annotation = command.getClass().getAnnotation(Command.class);
@@ -203,7 +204,7 @@ public final class CommandMap {
// Parse message.
String[] split = rawMessage.split(" ");
List<String> args = new LinkedList<>(Arrays.asList(split));
String label = args.remove(0);
String label = args.remove(0).toLowerCase();
String playerId = (player == null) ? consoleId : player.getAccount().getId();
// Check for special cases - currently only target command.

4
src/main/java/emu/grasscutter/command/commands/AccountCommand.java
View File

@@ -30,7 +30,7 @@ public final class AccountCommand implements CommandHandler {
}
if (args.size() < 2) {
CommandHandler.sendTranslatedMessage(sender, "commands.account.command_usage");
sendUsageMessage(sender);
return;
}
@@ -39,7 +39,7 @@ public final class AccountCommand implements CommandHandler {
switch (action) {
default:
CommandHandler.sendTranslatedMessage(sender, "commands.account.command_usage");
sendUsageMessage(sender);
return;
case "create":
int uid = 0;

6
src/main/java/emu/grasscutter/command/commands/AnnounceCommand.java
View File

@@ -23,14 +23,14 @@ public final class AnnounceCommand implements CommandHandler {
public void execute(Player sender, Player targetPlayer, List<String> args) {
var manager = Grasscutter.getGameServer().getAnnouncementSystem();
if (args.size() < 1) {
CommandHandler.sendTranslatedMessage(sender, "commands.announce.command_usage");
sendUsageMessage(sender);
return;
}
switch (args.get(0)) {
case "tpl":
if (args.size() < 2) {
CommandHandler.sendTranslatedMessage(sender, "commands.announce.command_usage");
sendUsageMessage(sender);
return;
}
@@ -52,7 +52,7 @@ public final class AnnounceCommand implements CommandHandler {
case "revoke":
if (args.size() < 2) {
CommandHandler.sendTranslatedMessage(sender, "commands.announce.command_usage");
sendUsageMessage(sender);
return;
}

2
src/main/java/emu/grasscutter/command/commands/ClearCommand.java
View File

@@ -83,7 +83,7 @@ public final class ClearCommand implements CommandHandler {
}
if (args.size() < 1) {
CommandHandler.sendTranslatedMessage(sender, "commands.clear.command_usage");
sendUsageMessage(sender);
return;
}

15
src/main/java/emu/grasscutter/command/commands/CoopCommand.java
View File

@@ -7,8 +7,6 @@ import emu.grasscutter.game.player.Player;
import java.util.List;
import static emu.grasscutter.utils.Language.translate;
@Command(label = "coop", usage = {"[<host UID>]"}, permission = "server.coop", permissionTargeted = "server.coop.others")
public final class CoopCommand implements CommandHandler {
@@ -17,25 +15,26 @@ public final class CoopCommand implements CommandHandler {
Player host = sender;
switch (args.size()) {
case 0: // Summon target to self
CommandHandler.sendMessage(sender, translate(sender, "commands.coop.usage"));
if (sender == null) // Console doesn't have a self to summon to
if (sender == null) { // Console doesn't have a self to summon to
sendUsageMessage(sender);
return;
}
break;
case 1: // Summon target to argument
try {
int hostId = Integer.parseInt(args.get(0));
host = Grasscutter.getGameServer().getPlayerByUid(hostId);
if (host == null) {
CommandHandler.sendMessage(sender, translate(sender, "commands.execution.player_offline_error"));
CommandHandler.sendTranslatedMessage(sender, "commands.execution.player_offline_error");
return;
}
break;
} catch (NumberFormatException ignored) {
CommandHandler.sendMessage(sender, translate(sender, "commands.generic.invalid.uid"));
CommandHandler.sendTranslatedMessage(sender, "commands.generic.invalid.uid");
return;
}
default:
CommandHandler.sendMessage(sender, translate(sender, "commands.coop.usage"));
sendUsageMessage(sender);
return;
}
@@ -45,6 +44,6 @@ public final class CoopCommand implements CommandHandler {
}
host.getServer().getMultiplayerSystem().applyEnterMp(targetPlayer, host.getUid());
targetPlayer.getServer().getMultiplayerSystem().applyEnterMpReply(host, targetPlayer.getUid(), true);
CommandHandler.sendMessage(sender, translate(sender, "commands.coop.success", targetPlayer.getNickname(), host.getNickname()));
CommandHandler.sendTranslatedMessage(sender, "commands.coop.success", targetPlayer.getNickname(), host.getNickname());
}
}

4
src/main/java/emu/grasscutter/command/commands/EnterDungeonCommand.java
View File

@@ -14,7 +14,7 @@ public final class EnterDungeonCommand implements CommandHandler {
@Override
public void execute(Player sender, Player targetPlayer, List<String> args) {
if (args.size() < 1) {
CommandHandler.sendMessage(sender, translate(sender, "commands.enter_dungeon.usage"));
sendUsageMessage(sender);
return;
}
@@ -33,7 +33,7 @@ public final class EnterDungeonCommand implements CommandHandler {
CommandHandler.sendMessage(sender, translate(sender, "commands.enter_dungeon.changed", dungeonId));
}
} catch (Exception e) {
CommandHandler.sendMessage(sender, translate(sender, "commands.enter_dungeon.usage"));
sendUsageMessage(sender);
}
}
}

8
src/main/java/emu/grasscutter/command/commands/GiveCommand.java
View File

@@ -67,7 +67,7 @@ public final class GiveCommand implements CommandHandler {
public GiveAllType giveAllType = GiveAllType.NONE;
};
private static GiveItemParameters parseArgs(Player sender, List<String> args) throws IllegalArgumentException {
private GiveItemParameters parseArgs(Player sender, List<String> args) throws IllegalArgumentException {
GiveItemParameters param = new GiveItemParameters();
// Extract any tagged arguments (e.g. "lv90", "x100", "r5")
@@ -99,7 +99,7 @@ public final class GiveCommand implements CommandHandler {
// At this point, first remaining argument MUST be itemId/avatarId
if (args.size() < 1) {
CommandHandler.sendTranslatedMessage(sender, "commands.give.usage"); // Reachable if someone does `/give lv90` or similar
sendUsageMessage(sender); // Reachable if someone does `/give lv90` or similar
throw new IllegalArgumentException();
}
String id = args.remove(0);
@@ -169,7 +169,7 @@ public final class GiveCommand implements CommandHandler {
throw e;
}
} else {
CommandHandler.sendTranslatedMessage(sender, "commands.give.usage");
sendUsageMessage(sender);
throw new IllegalArgumentException();
}
}
@@ -180,7 +180,7 @@ public final class GiveCommand implements CommandHandler {
@Override
public void execute(Player sender, Player targetPlayer, List<String> args) {
if (args.size() < 1) { // *No args*
CommandHandler.sendTranslatedMessage(sender, "commands.give.usage");
sendUsageMessage(sender);
return;
}
try {

3
src/main/java/emu/grasscutter/command/commands/HelpCommand.java
View File

@@ -59,8 +59,9 @@ public final class HelpCommand implements CommandHandler {
commands_no_permission.add(createCommand(player, command, args));
}
}
CommandHandler.sendTranslatedMessage(player, "commands.help.available_commands");
} else {
String command_str = args.remove(0);
String command_str = args.remove(0).toLowerCase();
CommandHandler command = handlers.get(command_str);
if (command == null) {
CommandHandler.sendTranslatedMessage(player, "commands.generic.command_exist_error");

2
src/main/java/emu/grasscutter/command/commands/KillAllCommand.java
View File

@@ -25,7 +25,7 @@ public final class KillAllCommand implements CommandHandler {
scene = targetPlayer.getWorld().getSceneById(Integer.parseInt(args.get(0)));
break;
default:
CommandHandler.sendMessage(sender, translate(sender, "commands.killall.usage"));
sendUsageMessage(sender);
return;
}
} catch (NumberFormatException ignored) {

5
src/main/java/emu/grasscutter/command/commands/KillCharacterCommand.java
View File

@@ -18,11 +18,6 @@ public final class KillCharacterCommand implements CommandHandler {
@Override
public void execute(Player sender, Player targetPlayer, List<String> args) {
if (args.isEmpty()) {
CommandHandler.sendMessage(sender, translate(sender, "commands.killCharacter.usage"));
return;
}
EntityAvatar entity = targetPlayer.getTeamManager().getCurrentAvatarEntity();
entity.setFightProperty(FightProperty.FIGHT_PROP_CUR_HP, 0f);
// Packets

4
src/main/java/emu/grasscutter/command/commands/PermissionCommand.java
View File

@@ -17,7 +17,7 @@ public final class PermissionCommand implements CommandHandler {
@Override
public void execute(Player sender, Player targetPlayer, List<String> args) {
if (args.size() != 2) {
CommandHandler.sendMessage(sender, translate(sender, "commands.permission.usage"));
sendUsageMessage(sender);
return;
}
@@ -37,7 +37,7 @@ public final class PermissionCommand implements CommandHandler {
switch (action) {
default:
CommandHandler.sendMessage(sender, translate(sender, "commands.permission.usage"));
sendUsageMessage(sender);
break;
case "add":
if (account.addPermission(permission)) {

4
src/main/java/emu/grasscutter/command/commands/QuestCommand.java
View File

@@ -15,7 +15,7 @@ public final class QuestCommand implements CommandHandler {
@Override
public void execute(Player sender, Player targetPlayer, List<String> args) {
if (args.size() != 2) {
CommandHandler.sendMessage(sender, translate(sender, "commands.quest.usage"));
sendUsageMessage(sender);
return;
}
@@ -53,7 +53,7 @@ public final class QuestCommand implements CommandHandler {
CommandHandler.sendMessage(sender, translate(sender, "commands.quest.finished", questId));
}
default -> {
CommandHandler.sendMessage(sender, translate(sender, "commands.quest.usage"));
sendUsageMessage(sender);
}
}
}

5
src/main/java/emu/grasscutter/command/commands/ResetShopLimitCommand.java
View File

@@ -14,11 +14,6 @@ public final class ResetShopLimitCommand implements CommandHandler {
@Override
public void execute(Player sender, Player targetPlayer, List<String> args) {
if (args.isEmpty()) {
CommandHandler.sendMessage(sender, translate(sender, "commands.resetShopLimit.usage"));
return;
}
targetPlayer.getShopLimit().forEach(x -> x.setNextRefreshTime(0));
targetPlayer.save();
CommandHandler.sendMessage(sender, translate(sender, "commands.resetShopLimit.success"));

4
src/main/java/emu/grasscutter/command/commands/SendMailCommand.java
View File

@@ -43,7 +43,7 @@ public final class SendMailCommand implements CommandHandler {
MailBuilder mailBuilder;
switch (args.get(0).toLowerCase()) {
case "help" -> {
CommandHandler.sendMessage(sender, translate(sender, "commands.sendMail.usage"));
sendUsageMessage(sender);
return;
}
case "all" -> mailBuilder = new MailBuilder(true, new Mail());
@@ -150,7 +150,7 @@ public final class SendMailCommand implements CommandHandler {
}
break;
default: // *No args*
CommandHandler.sendMessage(sender, translate(sender, "commands.give.usage"));
CommandHandler.sendTranslatedMessage(sender, "commands.sendMail.give_usage");
return;
}
mailBuilder.mail.itemList.add(new Mail.MailItem(item, amount, lvl));

6
src/main/java/emu/grasscutter/command/commands/SendMessageCommand.java
View File

@@ -8,8 +8,6 @@ import emu.grasscutter.game.player.Player;
import java.util.List;
import static emu.grasscutter.utils.Language.translate;
@Command(
label = "sendMessage",
aliases = {"say", "sendservmsg", "sendservermessage", "b", "broadcast"},
@@ -22,7 +20,7 @@ public final class SendMessageCommand implements CommandHandler {
@Override
public void execute(Player sender, Player targetPlayer, List<String> args) {
if (args.size() == 0) {
CommandHandler.sendMessage(sender, translate(sender, "commands.sendMessage.usage"));
sendUsageMessage(sender);
return;
}
@@ -35,6 +33,6 @@ public final class SendMessageCommand implements CommandHandler {
} else {
CommandHandler.sendMessage(targetPlayer, message);
}
CommandHandler.sendMessage(sender, translate(sender, "commands.sendMessage.success"));
CommandHandler.sendTranslatedMessage(sender, "commands.sendMessage.success");
}
}

2
src/main/java/emu/grasscutter/command/commands/SetFetterLevelCommand.java
View File

@@ -22,7 +22,7 @@ public final class SetFetterLevelCommand implements CommandHandler {
@Override
public void execute(Player sender, Player targetPlayer, List<String> args) {
if (args.size() != 1) {
CommandHandler.sendMessage(sender, translate(sender, "commands.setFetterLevel.usage"));
sendUsageMessage(sender);
return;
}

6
src/main/java/emu/grasscutter/command/commands/SetPropCommand.java
View File

@@ -10,7 +10,7 @@ import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.props.PlayerProperty;
import emu.grasscutter.game.tower.TowerLevelRecord;
@Command(label = "setProp", aliases = {"prop"}, usage = {"<prop> <value>"}, permission = "player.setprop", permissionTargeted = "player.setprop.others")
@Command(label = "setProp", aliases = {"prop"}, usage = {"<prop> <value>"}, permission = "player.setprop", permissionTargeted = "player.setprop.others")
public final class SetPropCommand implements CommandHandler {
static enum PseudoProp {
NONE,
@@ -95,7 +95,7 @@ public final class SetPropCommand implements CommandHandler {
@Override
public void execute(Player sender, Player targetPlayer, List<String> args) {
if (args.size() != 2) {
CommandHandler.sendTranslatedMessage(sender, "commands.setProp.usage");
sendUsageMessage(sender);
return;
}
String propStr = args.get(0).toLowerCase();
@@ -103,7 +103,7 @@ public final class SetPropCommand implements CommandHandler {
int value;
if (!props.containsKey(propStr)) {
CommandHandler.sendTranslatedMessage(sender, "commands.setProp.usage");
sendUsageMessage(sender);
return;
}
try {

4
src/main/java/emu/grasscutter/command/commands/SetStatsCommand.java
View File

@@ -71,7 +71,7 @@ public final class SetStatsCommand implements CommandHandler {
statStr = args.get(0).toLowerCase();
valueStr = args.get(1);
} else {
CommandHandler.sendTranslatedMessage(sender, "commands.setStats.usage");
sendUsageMessage(sender);
return;
}
@@ -105,7 +105,7 @@ public final class SetStatsCommand implements CommandHandler {
CommandHandler.sendTranslatedMessage(sender, "commands.generic.set_for_to", stat.name, uidStr, valueStr);
}
} else {
CommandHandler.sendTranslatedMessage(sender, "commands.setStats.usage");
sendUsageMessage(sender);
}
return;
}

2
src/main/java/emu/grasscutter/command/commands/SpawnCommand.java
View File

@@ -60,7 +60,7 @@ public final class SpawnCommand implements CommandHandler {
}
break;
default:
CommandHandler.sendMessage(sender, translate(sender, "commands.spawn.usage"));
sendUsageMessage(sender);
return;
}

14
src/main/java/emu/grasscutter/command/commands/TalentCommand.java
View File

@@ -49,9 +49,7 @@ public final class TalentCommand implements CommandHandler {
@Override
public void execute(Player sender, Player targetPlayer, List<String> args) {
if (args.size() < 1){
CommandHandler.sendMessage(sender, translate(sender, "commands.talent.usage_1"));
CommandHandler.sendMessage(sender, translate(sender, "commands.talent.usage_2"));
CommandHandler.sendMessage(sender, translate(sender, "commands.talent.usage_3"));
sendUsageMessage(sender);
return;
}
@@ -60,15 +58,13 @@ public final class TalentCommand implements CommandHandler {
String cmdSwitch = args.get(0);
switch (cmdSwitch) {
default -> {
CommandHandler.sendMessage(sender, translate(sender, "commands.talent.usage_1"));
CommandHandler.sendMessage(sender, translate(sender, "commands.talent.usage_2"));
CommandHandler.sendMessage(sender, translate(sender, "commands.talent.usage_3"));
sendUsageMessage(sender);
return;
}
case "set" -> {
if (args.size() < 3) {
CommandHandler.sendMessage(sender, translate(sender, "commands.talent.usage_1"));
CommandHandler.sendMessage(sender, translate(sender, "commands.talent.usage_3"));
sendUsageMessage(sender);
sendUsageMessage(sender);
return;
}
try {
@@ -82,7 +78,7 @@ public final class TalentCommand implements CommandHandler {
}
case "n", "e", "q" -> {
if (args.size() < 2) {
CommandHandler.sendMessage(sender, translate(sender, "commands.talent.usage_2"));
sendUsageMessage(sender);
return;
}
AvatarSkillDepotData SkillDepot = avatar.getData().getSkillDepot();

15
src/main/java/emu/grasscutter/command/commands/TeamCommand.java
View File

@@ -12,8 +12,6 @@ import static emu.grasscutter.config.Configuration.*;
import java.util.ArrayList;
import java.util.HashSet;
import static emu.grasscutter.Configuration.*;
@Command(
label = "team",
usage = {"add <avatarId,...>", "(remove|set) [index|first|last|index-index,...]"},
@@ -25,7 +23,7 @@ public final class TeamCommand implements CommandHandler {
@Override
public void execute(Player sender, Player targetPlayer, List<String> args) {
if (args.isEmpty()) {
CommandHandler.sendTranslatedMessage(sender, "commands.team.usage");
sendUsageMessage(sender);
return;
}
@@ -44,7 +42,7 @@ public final class TeamCommand implements CommandHandler {
default:
CommandHandler.sendTranslatedMessage(sender, "commands.team.invalid_usage");
CommandHandler.sendTranslatedMessage(sender, "commands.team.usage");
sendUsageMessage(sender);
return;
}
@@ -55,7 +53,7 @@ public final class TeamCommand implements CommandHandler {
private boolean addCommand(Player sender, Player targetPlayer, List<String> args) {
if (args.size() < 2) {
CommandHandler.sendTranslatedMessage(sender, "commands.team.invalid_usage");
CommandHandler.sendTranslatedMessage(sender, "commands.team.add_usage");
sendUsageMessage(sender);
return false;
}
@@ -80,7 +78,8 @@ public final class TeamCommand implements CommandHandler {
for (var avatarId: avatarIds) {
int id = Integer.parseInt(avatarId);
var success = addAvatar(sender, targetPlayer, id, index);
if (!addAvatar(sender, targetPlayer, id, index))
CommandHandler.sendTranslatedMessage(sender, "commands.team.failed_to_add_avatar", avatarId);
if (index > 0) ++index;
}
return true;
@@ -89,7 +88,7 @@ public final class TeamCommand implements CommandHandler {
private boolean removeCommand(Player sender, Player targetPlayer, List<String> args) {
if (args.size() < 2) {
CommandHandler.sendTranslatedMessage(sender, "commands.team.invalid_usage");
CommandHandler.sendTranslatedMessage(sender, "commands.team.remove_usage");
sendUsageMessage(sender);
return false;
}
@@ -137,7 +136,7 @@ public final class TeamCommand implements CommandHandler {
private boolean setCommand(Player sender, Player targetPlayer, List<String> args) {
if (args.size() < 3) {
CommandHandler.sendTranslatedMessage(sender, "commands.team.invalid_usage");
CommandHandler.sendTranslatedMessage(sender, "commands.team.set_usage");
sendUsageMessage(sender);
return false;
}

2
src/main/java/emu/grasscutter/command/commands/TeleportCommand.java
View File

@@ -48,7 +48,7 @@ public final class TeleportCommand implements CommandHandler {
}
break;
default:
CommandHandler.sendMessage(sender, translate(sender, "commands.teleport.usage"));
sendUsageMessage(sender);
return;
}

2
src/main/java/emu/grasscutter/command/commands/WeatherCommand.java
View File

@@ -30,7 +30,7 @@ public final class WeatherCommand implements CommandHandler {
weatherId = Integer.parseInt(arg);
} catch (NumberFormatException ignored) {
CommandHandler.sendTranslatedMessage(sender, "commands.generic.invalid.id");
CommandHandler.sendTranslatedMessage(sender, "commands.weather.usage");
sendUsageMessage(sender);
return;
}
}