Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-02-06 10:06:51 +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

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;
}