From d8b2e787e5077548fa54ea9620393bffc5adf54d Mon Sep 17 00:00:00 2001 From: AnimeGitB Date: Wed, 4 May 2022 18:46:42 +0930 Subject: [PATCH] Commands Targeting rework --- .../emu/grasscutter/command/CommandMap.java | 44 +++-- .../command/commands/ChangeSceneCommand.java | 13 +- .../command/commands/ClearCommand.java | 148 +++++++-------- .../command/commands/CoopCommand.java | 52 +++-- .../command/commands/DropCommand.java | 72 ++++--- .../command/commands/EnterDungeonCommand.java | 8 +- .../command/commands/GiveAllCommand.java | 47 +---- .../command/commands/GiveArtifactCommand.java | 111 ++++++----- .../command/commands/GiveCharCommand.java | 72 +++---- .../command/commands/GiveCommand.java | 127 ++++--------- .../command/commands/GodModeCommand.java | 45 +++-- .../command/commands/HealCommand.java | 6 +- .../command/commands/KickCommand.java | 10 +- .../command/commands/KillAllCommand.java | 54 ++---- .../commands/KillCharacterCommand.java | 34 +--- .../command/commands/PermissionCommand.java | 14 +- .../command/commands/PositionCommand.java | 8 +- .../command/commands/ResetConstCommand.java | 10 +- .../commands/ResetShopLimitCommand.java | 8 +- .../command/commands/SendMailCommand.java | 56 +++--- .../command/commands/SendMessageCommand.java | 25 +-- .../commands/SetFetterLevelCommand.java | 10 +- .../command/commands/SetStatsCommand.java | 6 +- .../commands/SetWorldLevelCommand.java | 10 +- .../command/commands/SpawnCommand.java | 123 ++++++------ .../command/commands/TalentCommand.java | 177 ++++++++---------- .../command/commands/TeleportAllCommand.java | 14 +- .../command/commands/TeleportCommand.java | 113 +++++------ .../command/commands/WeatherCommand.java | 42 +++-- .../emu/grasscutter/languages/Language.java | 37 ++-- 30 files changed, 664 insertions(+), 832 deletions(-) diff --git a/src/main/java/emu/grasscutter/command/CommandMap.java b/src/main/java/emu/grasscutter/command/CommandMap.java index a5386809f..300c00b29 100644 --- a/src/main/java/emu/grasscutter/command/CommandMap.java +++ b/src/main/java/emu/grasscutter/command/CommandMap.java @@ -117,29 +117,37 @@ public final class CommandMap { String[] split = rawMessage.split(" "); List args = new LinkedList<>(Arrays.asList(split)); String label = args.remove(0); - // Check for special case String playerId = (player == null) ? consoleId : player.getAccount().getId(); - if (label == "target") { // Sets or clears default targetPlayer - if (args.size() < 1) { - targetPlayers.remove(playerId); - CommandHandler.sendMessage(player, Grasscutter.getLanguage().Target_cleared); - } else { - try { - String sUid = args.get(0); - int uid = Integer.parseInt(sUid); - targetPlayer = Grasscutter.getGameServer().getPlayerByUid(uid); - if (targetPlayer == null) { - CommandHandler.sendMessage(player, Grasscutter.getLanguage().Player_not_found_or_offline); - } else { - targetPlayers.put(playerId, targetPlayer); - CommandHandler.sendMessage(player, Grasscutter.getLanguage().Target_set.replace("{uid}", sUid)); - } - } catch (NumberFormatException e) { - CommandHandler.sendMessage(player, Grasscutter.getLanguage().Invalid_UID); + // Check for special cases - currently only target command + String targetUidStr = null; + if (label.startsWith("@")) { // @[UID] + targetUidStr = label.substring(1); + } else if (label == "target") { // target [[@]UID] + targetUidStr = args.get(0); + if (targetUidStr.startsWith("@")) { + targetUidStr = targetUidStr.substring(1); + } + } + if (targetUidStr == "") { // Clears default targetPlayer + targetPlayers.remove(playerId); + CommandHandler.sendMessage(player, Grasscutter.getLanguage().Target_cleared); + return; + } else if (targetUidStr != null) { // Sets default targetPlayer to the UID given + try { + int uid = Integer.parseInt(targetUidStr); + targetPlayer = Grasscutter.getGameServer().getPlayerByUid(uid); + if (targetPlayer == null) { + CommandHandler.sendMessage(player, Grasscutter.getLanguage().Player_not_found_or_offline); + } else { + targetPlayers.put(playerId, targetPlayer); + CommandHandler.sendMessage(player, Grasscutter.getLanguage().Target_set.replace("{uid}", targetUidStr)); } + } catch (NumberFormatException e) { + CommandHandler.sendMessage(player, Grasscutter.getLanguage().Invalid_UID); } return; } + // Get command handler. CommandHandler handler = this.commands.get(label); if (handler == null) { diff --git a/src/main/java/emu/grasscutter/command/commands/ChangeSceneCommand.java b/src/main/java/emu/grasscutter/command/commands/ChangeSceneCommand.java index 404b05a43..fb1694325 100644 --- a/src/main/java/emu/grasscutter/command/commands/ChangeSceneCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/ChangeSceneCommand.java @@ -3,7 +3,6 @@ package emu.grasscutter.command.commands; import emu.grasscutter.Grasscutter; import emu.grasscutter.command.Command; import emu.grasscutter.command.CommandHandler; -import emu.grasscutter.game.gacha.GachaRecord; import emu.grasscutter.game.player.Player; import java.util.List; @@ -13,12 +12,12 @@ import java.util.List; public final class ChangeSceneCommand implements CommandHandler { @Override public void execute(Player sender, Player targetPlayer, List args) { - if (sender == null) { - CommandHandler.sendMessage(null, Grasscutter.getLanguage().Run_this_command_in_game); + if (targetPlayer == null) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Target_needed); return; } - if (args.size() < 1) { + if (args.size() != 1) { CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Change_screen_usage); return; } @@ -26,19 +25,19 @@ public final class ChangeSceneCommand implements CommandHandler { try { int sceneId = Integer.parseInt(args.get(0)); - if (sceneId == sender.getSceneId()) { + if (sceneId == targetPlayer.getSceneId()) { CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Change_screen_you_in_that_screen); return; } - boolean result = sender.getWorld().transferPlayerToScene(sender, sceneId, sender.getPos()); + boolean result = targetPlayer.getWorld().transferPlayerToScene(targetPlayer, sceneId, targetPlayer.getPos()); CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Change_screen + sceneId); if (!result) { CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Change_screen_not_exist); } } catch (Exception e) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Change_screen_usage); + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_arguments); } } } diff --git a/src/main/java/emu/grasscutter/command/commands/ClearCommand.java b/src/main/java/emu/grasscutter/command/commands/ClearCommand.java index d79d94c4b..6abe46b1d 100644 --- a/src/main/java/emu/grasscutter/command/commands/ClearCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/ClearCommand.java @@ -17,90 +17,74 @@ public final class ClearCommand implements CommandHandler { @Override public void execute(Player sender, Player targetPlayer, List args) { - int target; - String cmdSwitch = ""; - if (sender == null) { - CommandHandler.sendMessage(null, Grasscutter.getLanguage().Run_this_command_in_game); - return; - } - Inventory playerInventory = sender.getInventory(); - try { - if (args.size() == 1) { - cmdSwitch = args.get(0); - target = sender.getUid(); - }else { - cmdSwitch = args.get(1); - target = Integer.parseInt(args.get(0)); - } - switch (cmdSwitch) { - case "wp" -> { - playerInventory.getItems().values().stream() - .filter(item -> item.getItemType() == ItemType.ITEM_WEAPON) - .filter(item -> !item.isLocked() && !item.isEquipped()) - .forEach(item -> playerInventory.removeItem(item, item.getCount())); - sender.dropMessage(Grasscutter.getLanguage().Clear_weapons.replace("{name}", targetPlayer.getNickname())); - } - case "art" -> { - playerInventory.getItems().values().stream() - .filter(item -> item.getItemType() == ItemType.ITEM_RELIQUARY) - .filter(item -> item.getLevel() == 1 && item.getExp() == 0) - .filter(item -> !item.isLocked() && !item.isEquipped()) - .forEach(item -> playerInventory.removeItem(item, item.getCount())); - sender.dropMessage(Grasscutter.getLanguage().Clear_artifacts.replace("{name}", targetPlayer.getNickname())); - } - case "mat" -> { - playerInventory.getItems().values().stream() - .filter(item -> item.getItemType() == ItemType.ITEM_MATERIAL) - .filter(item -> item.getLevel() == 1 && item.getExp() == 0) - .filter(item -> !item.isLocked() && !item.isEquipped()) - .forEach(item -> playerInventory.removeItem(item, item.getCount())); - sender.dropMessage(Grasscutter.getLanguage().Clear_artifacts.replace("{name}", targetPlayer.getNickname())); - } - case "all" -> { - playerInventory.getItems().values().stream() - .filter(item1 -> item1.getItemType() == ItemType.ITEM_RELIQUARY) - .filter(item1 -> item1.getLevel() == 1 && item1.getExp() == 0) - .filter(item1 -> !item1.isLocked() && !item1.isEquipped()) - .forEach(item1 -> playerInventory.removeItem(item1, item1.getCount())); - sender.dropMessage(Grasscutter.getLanguage().Clear_artifacts.replace("{name}", targetPlayer.getNickname())); - playerInventory.getItems().values().stream() - .filter(item2 -> item2.getItemType() == ItemType.ITEM_MATERIAL) - .filter(item2 -> !item2.isLocked() && !item2.isEquipped()) - .forEach(item2 -> playerInventory.removeItem(item2, item2.getCount())); - sender.dropMessage(Grasscutter.getLanguage().Clear_artifacts.replace("{name}", targetPlayer.getNickname())); - playerInventory.getItems().values().stream() - .filter(item3 -> item3.getItemType() == ItemType.ITEM_WEAPON) - .filter(item3 -> item3.getLevel() == 1 && item3.getExp() == 0) - .filter(item3 -> !item3.isLocked() && !item3.isEquipped()) - .forEach(item3 -> playerInventory.removeItem(item3, item3.getCount())); - sender.dropMessage(Grasscutter.getLanguage().Clear_artifacts.replace("{name}", targetPlayer.getNickname())); - playerInventory.getItems().values().stream() - .filter(item4 -> item4.getItemType() == ItemType.ITEM_FURNITURE) - .filter(item4 -> !item4.isLocked() && !item4.isEquipped()) - .forEach(item4 -> playerInventory.removeItem(item4, item4.getCount())); - sender.dropMessage(Grasscutter.getLanguage().Clear_furniture.replace("{name}", targetPlayer.getNickname())); - playerInventory.getItems().values().stream() - .filter(item5 -> item5.getItemType() == ItemType.ITEM_DISPLAY) - .filter(item5 -> !item5.isLocked() && !item5.isEquipped()) - .forEach(item5 -> playerInventory.removeItem(item5, item5.getCount())); - sender.dropMessage(Grasscutter.getLanguage().Clear_displays.replace("{name}", targetPlayer.getNickname())); - playerInventory.getItems().values().stream() - .filter(item6 -> item6.getItemType() == ItemType.ITEM_VIRTUAL) - .filter(item6 -> !item6.isLocked() && !item6.isEquipped()) - .forEach(item6 -> playerInventory.removeItem(item6, item6.getCount())); - sender.dropMessage(Grasscutter.getLanguage().Clear_virtuals.replace("{name}", targetPlayer.getNickname())); - sender.dropMessage(Grasscutter.getLanguage().Clear_everything.replace("{name}", targetPlayer.getNickname())); - } - } - } catch (NumberFormatException ignored) { - // TODO: Parse from item name using GM Handbook. - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_playerId); - return; - } - if (targetPlayer == null) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Player_not_found); + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Target_needed); return; } + if (args.size() < 1) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Clear_usage); + return; + } + Inventory playerInventory = targetPlayer.getInventory(); + switch (args.get(0)) { + case "wp" -> { + playerInventory.getItems().values().stream() + .filter(item -> item.getItemType() == ItemType.ITEM_WEAPON) + .filter(item -> !item.isLocked() && !item.isEquipped()) + .forEach(item -> playerInventory.removeItem(item, item.getCount())); + sender.dropMessage(Grasscutter.getLanguage().Clear_weapons.replace("{name}", targetPlayer.getNickname())); + } + case "art" -> { + playerInventory.getItems().values().stream() + .filter(item -> item.getItemType() == ItemType.ITEM_RELIQUARY) + .filter(item -> item.getLevel() == 1 && item.getExp() == 0) + .filter(item -> !item.isLocked() && !item.isEquipped()) + .forEach(item -> playerInventory.removeItem(item, item.getCount())); + sender.dropMessage(Grasscutter.getLanguage().Clear_artifacts.replace("{name}", targetPlayer.getNickname())); + } + case "mat" -> { + playerInventory.getItems().values().stream() + .filter(item -> item.getItemType() == ItemType.ITEM_MATERIAL) + .filter(item -> item.getLevel() == 1 && item.getExp() == 0) + .filter(item -> !item.isLocked() && !item.isEquipped()) + .forEach(item -> playerInventory.removeItem(item, item.getCount())); + sender.dropMessage(Grasscutter.getLanguage().Clear_artifacts.replace("{name}", targetPlayer.getNickname())); + } + case "all" -> { + playerInventory.getItems().values().stream() + .filter(item1 -> item1.getItemType() == ItemType.ITEM_RELIQUARY) + .filter(item1 -> item1.getLevel() == 1 && item1.getExp() == 0) + .filter(item1 -> !item1.isLocked() && !item1.isEquipped()) + .forEach(item1 -> playerInventory.removeItem(item1, item1.getCount())); + sender.dropMessage(Grasscutter.getLanguage().Clear_artifacts.replace("{name}", targetPlayer.getNickname())); + playerInventory.getItems().values().stream() + .filter(item2 -> item2.getItemType() == ItemType.ITEM_MATERIAL) + .filter(item2 -> !item2.isLocked() && !item2.isEquipped()) + .forEach(item2 -> playerInventory.removeItem(item2, item2.getCount())); + sender.dropMessage(Grasscutter.getLanguage().Clear_artifacts.replace("{name}", targetPlayer.getNickname())); + playerInventory.getItems().values().stream() + .filter(item3 -> item3.getItemType() == ItemType.ITEM_WEAPON) + .filter(item3 -> item3.getLevel() == 1 && item3.getExp() == 0) + .filter(item3 -> !item3.isLocked() && !item3.isEquipped()) + .forEach(item3 -> playerInventory.removeItem(item3, item3.getCount())); + sender.dropMessage(Grasscutter.getLanguage().Clear_artifacts.replace("{name}", targetPlayer.getNickname())); + playerInventory.getItems().values().stream() + .filter(item4 -> item4.getItemType() == ItemType.ITEM_FURNITURE) + .filter(item4 -> !item4.isLocked() && !item4.isEquipped()) + .forEach(item4 -> playerInventory.removeItem(item4, item4.getCount())); + sender.dropMessage(Grasscutter.getLanguage().Clear_furniture.replace("{name}", targetPlayer.getNickname())); + playerInventory.getItems().values().stream() + .filter(item5 -> item5.getItemType() == ItemType.ITEM_DISPLAY) + .filter(item5 -> !item5.isLocked() && !item5.isEquipped()) + .forEach(item5 -> playerInventory.removeItem(item5, item5.getCount())); + sender.dropMessage(Grasscutter.getLanguage().Clear_displays.replace("{name}", targetPlayer.getNickname())); + playerInventory.getItems().values().stream() + .filter(item6 -> item6.getItemType() == ItemType.ITEM_VIRTUAL) + .filter(item6 -> !item6.isLocked() && !item6.isEquipped()) + .forEach(item6 -> playerInventory.removeItem(item6, item6.getCount())); + sender.dropMessage(Grasscutter.getLanguage().Clear_virtuals.replace("{name}", targetPlayer.getNickname())); + sender.dropMessage(Grasscutter.getLanguage().Clear_everything.replace("{name}", targetPlayer.getNickname())); + } + } } } diff --git a/src/main/java/emu/grasscutter/command/commands/CoopCommand.java b/src/main/java/emu/grasscutter/command/commands/CoopCommand.java index c192aedda..f20d4aa01 100644 --- a/src/main/java/emu/grasscutter/command/commands/CoopCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/CoopCommand.java @@ -7,32 +7,44 @@ import emu.grasscutter.game.player.Player; import java.util.List; -@Command(label = "coop", usage = "coop", +@Command(label = "coop", usage = "coop [host UID]", description = "Forces someone to join the world of others", permission = "server.coop") public final class CoopCommand implements CommandHandler { @Override public void execute(Player sender, Player targetPlayer, List args) { - if (args.size() < 2) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Coop_usage); - return; + if (targetPlayer == null) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Target_needed); + return; + } + + Player host = sender; + switch (args.size()) { + case 0: // Summon target to self + break; + case 1: // Summon target to argument + try { + int hostId = Integer.parseInt(args.get(1)); + host = sender.getServer().getPlayerByUid(hostId); + if (host == null) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Player_is_offline); + return; + } + break; + } catch (Exception e) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_playerId); + return; + } + default: + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Coop_usage); + return; } - try { - int tid = Integer.parseInt(args.get(0)); - int hostId = Integer.parseInt(args.get(1)); - Player host = sender.getServer().getPlayerByUid(hostId); - Player want = sender.getServer().getPlayerByUid(tid); - if (host == null || want == null) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Player_is_offline); - return; - } - if (want.isInMultiplayer()) { - sender.getServer().getMultiplayerManager().leaveCoop(want); - } - sender.getServer().getMultiplayerManager().applyEnterMp(want, hostId); - sender.getServer().getMultiplayerManager().applyEnterMpReply(host, tid, true); - } catch (Exception e) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_playerId); + + if (targetPlayer.isInMultiplayer()) { + sender.getServer().getMultiplayerManager().leaveCoop(targetPlayer); } + sender.getServer().getMultiplayerManager().applyEnterMp(targetPlayer, host.getUid()); + sender.getServer().getMultiplayerManager().applyEnterMpReply(host, targetPlayer.getUid(), true); + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Coop_success.replace("{host}", host.getNickname()).replace("{target}", targetPlayer.getNickname())); } } diff --git a/src/main/java/emu/grasscutter/command/commands/DropCommand.java b/src/main/java/emu/grasscutter/command/commands/DropCommand.java index 859b360f9..29c5f10c6 100644 --- a/src/main/java/emu/grasscutter/command/commands/DropCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/DropCommand.java @@ -17,41 +17,51 @@ public final class DropCommand implements CommandHandler { @Override public void execute(Player sender, Player targetPlayer, List args) { - if (sender == null) { - CommandHandler.sendMessage(null, Grasscutter.getLanguage().Run_this_command_in_game); + if (targetPlayer == null) { + CommandHandler.sendMessage(null, Grasscutter.getLanguage().Target_needed); return; } + + int item = 0; + int amount = 1; - if (args.size() < 1) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Drop_usage); - return; - } - - try { - int item = Integer.parseInt(args.get(0)); - int amount = 1; - if (args.size() > 1) amount = Integer.parseInt(args.get(1)); - - ItemData itemData = GameData.getItemDataMap().get(item); - if (itemData == null) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_item_id); - return; - } - - if (itemData.isEquip()) { - float range = (5f + (.1f * amount)); - for (int i = 0; i < amount; i++) { - Position pos = sender.getPos().clone().addX((float) (Math.random() * range) - (range / 2)).addY(3f).addZ((float) (Math.random() * range) - (range / 2)); - EntityItem entity = new EntityItem(sender.getScene(), sender, itemData, pos, 1); - sender.getScene().addEntity(entity); + switch (args.size()) { + case 2: + try { + amount = Integer.parseInt(args.get(1)); + } catch (NumberFormatException ignored) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_amount); + return; + } // Slightly cheeky here: no break so it falls through to initialize the first argument too + case 1: + try { + item = Integer.parseInt(args.get(0)); + } catch (NumberFormatException ignored) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_item_id); + return; } - } else { - EntityItem entity = new EntityItem(sender.getScene(), sender, itemData, sender.getPos().clone().addY(3f), amount); - sender.getScene().addEntity(entity); - } - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Drop_dropped_of.replace("{amount}", Integer.toString(amount)).replace("{item}", Integer.toString(item))); - } catch (NumberFormatException ignored) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_item_or_player_id); + break; + default: + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Drop_usage); + return; } + + ItemData itemData = GameData.getItemDataMap().get(item); + if (itemData == null) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_item_id); + return; + } + if (itemData.isEquip()) { + float range = (5f + (.1f * amount)); + for (int i = 0; i < amount; i++) { + Position pos = targetPlayer.getPos().clone().addX((float) (Math.random() * range) - (range / 2)).addY(3f).addZ((float) (Math.random() * range) - (range / 2)); + EntityItem entity = new EntityItem(targetPlayer.getScene(), targetPlayer, itemData, pos, 1); + targetPlayer.getScene().addEntity(entity); + } + } else { + EntityItem entity = new EntityItem(targetPlayer.getScene(), targetPlayer, itemData, targetPlayer.getPos().clone().addY(3f), amount); + targetPlayer.getScene().addEntity(entity); + } + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Drop_dropped_of.replace("{amount}", Integer.toString(amount)).replace("{item}", Integer.toString(item))); } } \ No newline at end of file diff --git a/src/main/java/emu/grasscutter/command/commands/EnterDungeonCommand.java b/src/main/java/emu/grasscutter/command/commands/EnterDungeonCommand.java index 7151b03c2..a52787b68 100644 --- a/src/main/java/emu/grasscutter/command/commands/EnterDungeonCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/EnterDungeonCommand.java @@ -12,8 +12,8 @@ import java.util.List; public final class EnterDungeonCommand implements CommandHandler { @Override public void execute(Player sender, Player targetPlayer, List args) { - if (sender == null) { - CommandHandler.sendMessage(null, Grasscutter.getLanguage().Run_this_command_in_game); + if (targetPlayer == null) { + CommandHandler.sendMessage(null, Grasscutter.getLanguage().Target_needed); return; } @@ -25,12 +25,12 @@ public final class EnterDungeonCommand implements CommandHandler { try { int dungeonId = Integer.parseInt(args.get(0)); - if (dungeonId == sender.getSceneId()) { + if (dungeonId == targetPlayer.getSceneId()) { CommandHandler.sendMessage(sender, Grasscutter.getLanguage().EnterDungeon_you_in_that_dungeon); return; } - boolean result = sender.getServer().getDungeonManager().enterDungeon(sender.getSession().getPlayer(), 0, dungeonId); + boolean result = targetPlayer.getServer().getDungeonManager().enterDungeon(targetPlayer.getSession().getPlayer(), 0, dungeonId); CommandHandler.sendMessage(sender, Grasscutter.getLanguage().EnterDungeon_changed_to_dungeon + dungeonId); if (!result) { diff --git a/src/main/java/emu/grasscutter/command/commands/GiveAllCommand.java b/src/main/java/emu/grasscutter/command/commands/GiveAllCommand.java index 35c1fafef..9158b5e87 100644 --- a/src/main/java/emu/grasscutter/command/commands/GiveAllCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/GiveAllCommand.java @@ -13,61 +13,34 @@ import emu.grasscutter.game.player.Player; import java.util.*; -@Command(label = "giveall", usage = "giveall [player] [amount]", +@Command(label = "giveall", usage = "giveall [amount]", description = "Gives all items", aliases = {"givea"}, permission = "player.giveall", threading = true) public final class GiveAllCommand implements CommandHandler { @Override public void execute(Player sender, Player targetPlayer, List args) { - int target, amount = 99999; + if (targetPlayer == null) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Target_needed); + return; + } + int amount = 99999; switch (args.size()) { - case 0: // *no args* - if (sender == null) { - CommandHandler.sendMessage(null, Grasscutter.getLanguage().Run_this_command_in_game); - return; - } - target = sender.getUid(); + case 0: break; - - case 1: // [player] + case 1: // [amount] try { - target = Integer.parseInt(args.get(0)); - if (Grasscutter.getGameServer().getPlayerByUid(target) == null) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_playerId); - return; - } - }catch (NumberFormatException ignored){ - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_playerId); - return; - } - break; - - case 2: // [player] [amount] - try { - target = Integer.parseInt(args.get(0)); - if (Grasscutter.getGameServer().getPlayerByUid(target) == null) { - target = sender.getUid(); - amount = Integer.parseInt(args.get(0)); - } else { - amount = Integer.parseInt(args.get(1)); - } + amount = Integer.parseInt(args.get(0)); } catch (NumberFormatException ignored) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().GiveAll_invalid_amount_or_playerId); + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_amount); return; } break; - default: // invalid CommandHandler.sendMessage(null, Grasscutter.getLanguage().GiveAll_usage); return; } - if (targetPlayer == null) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Player_not_found); - return; - } - this.giveAllItems(targetPlayer, amount); CommandHandler.sendMessage(sender, Grasscutter.getLanguage().GiveAll_done); } diff --git a/src/main/java/emu/grasscutter/command/commands/GiveArtifactCommand.java b/src/main/java/emu/grasscutter/command/commands/GiveArtifactCommand.java index e431a30cc..d2bd95922 100644 --- a/src/main/java/emu/grasscutter/command/commands/GiveArtifactCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/GiveArtifactCommand.java @@ -14,72 +14,67 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -@Command(label = "giveart", usage = "giveart [player] [[,]]... [level]", description = "Gives the player a specified artifact", aliases = {"gart"}, permission = "player.giveart") +@Command(label = "giveart", usage = "giveart [[,]]... [level]", description = "Gives the player a specified artifact", aliases = {"gart"}, permission = "player.giveart") public final class GiveArtifactCommand implements CommandHandler { @Override public void execute(Player sender, Player targetPlayer, List args) { - int size = args.size(), target, itemId, mainPropId, level = 1; - ArrayList appendPropIdList = new ArrayList<>(); - String msg = Grasscutter.getLanguage().GiveArtifact_usage; - - if (sender == null && size < 2) { - CommandHandler.sendMessage(null, msg); - return; - } - - if (size >= 2) { - try { - try { - int last = Integer.parseInt(args.get(size - 1)); - if (last >= 1 && last <= 21) { - level = last; - size--; - } - } catch (NumberFormatException ignored) { - } - target = Integer.parseInt(args.get(0)); - int fromIdx; - if (Grasscutter.getGameServer().getPlayerByUid(target) == null && sender != null) { - target = sender.getUid(); - itemId = Integer.parseInt(args.get(0)); - mainPropId = Integer.parseInt(args.get(1)); - fromIdx = 2; - } else { - target = Integer.parseInt(args.get(0)); - itemId = Integer.parseInt(args.get(1)); - mainPropId = Integer.parseInt(args.get(2)); - fromIdx = 3; - } - args.subList(fromIdx, size).forEach(it -> { - String[] arr; - int n = 1; - if ((arr = it.split(",")).length == 2) { - it = arr[0]; - n = Integer.parseInt(arr[1]); - if (n > 200) { - n = 200; - } - } - appendPropIdList.addAll(Collections.nCopies(n, Integer.parseInt(it))); - }); - } catch (Exception ignored) { - CommandHandler.sendMessage(sender, msg); - return; - } - } else { - CommandHandler.sendMessage(sender, msg); - return; - } - if (targetPlayer == null) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Player_not_found); + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Target_needed); return; } - ItemData itemData = GameData.getItemDataMap().get(itemId); + if (args.size() < 2) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().GiveArtifact_usage); + return; + } + int itemId; + try { + itemId = Integer.parseInt(args.remove(0)); + } catch (NumberFormatException ignored) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_artifact_id); + return; + } + ItemData itemData = GameData.getItemDataMap().get(itemId); if (itemData.getItemType() != ItemType.ITEM_RELIQUARY) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().GiveArtifact_invalid_artifact_id); + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_artifact_id); + return; + } + + int mainPropId; + try { + mainPropId = Integer.parseInt(args.remove(0)); + } catch (NumberFormatException ignored) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_arguments); + return; + } + + int level = 1; + try { + int last = Integer.parseInt(args.get(args.size()-1)); + if (last > 0 && last < 21) { // Luckily appendPropIds aren't in the range of [1,20] + level = last; + args.remove(args.size()-1); + } + } catch (NumberFormatException ignored) { // Could be a stat,times string so no need to panic + } + + ArrayList appendPropIdList = new ArrayList<>(); + try { + args.forEach(it -> { + String[] arr; + int n = 1; + if ((arr = it.split(",")).length == 2) { + it = arr[0]; + n = Integer.parseInt(arr[1]); + if (n > 200) { + n = 200; + } + } + appendPropIdList.addAll(Collections.nCopies(n, Integer.parseInt(it))); + }); + } catch (Exception ignored) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_arguments); return; } @@ -90,7 +85,7 @@ public final class GiveArtifactCommand implements CommandHandler { item.getAppendPropIdList().addAll(appendPropIdList); targetPlayer.getInventory().addItem(item, ActionReason.SubfieldDrop); - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().GiveArtifact_given.replace("{itemId}", Integer.toString(itemId)).replace("target", Integer.toString(target))); + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().GiveArtifact_given.replace("{itemId}", Integer.toString(itemId)).replace("target", Integer.toString(targetPlayer.getUid()))); } } diff --git a/src/main/java/emu/grasscutter/command/commands/GiveCharCommand.java b/src/main/java/emu/grasscutter/command/commands/GiveCharCommand.java index c27b215e9..6283a8e78 100644 --- a/src/main/java/emu/grasscutter/command/commands/GiveCharCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/GiveCharCommand.java @@ -10,75 +10,57 @@ import emu.grasscutter.game.player.Player; import java.util.List; -@Command(label = "givechar", usage = "givechar [level]", +@Command(label = "givechar", usage = "givechar [level]", description = "Gives the player a specified character", aliases = {"givec"}, permission = "player.givechar") public final class GiveCharCommand implements CommandHandler { @Override public void execute(Player sender, Player targetPlayer, List args) { - int target, avatarId, level = 1, ascension; - - if (sender == null && args.size() < 2) { - CommandHandler.sendMessage(null, Grasscutter.getLanguage().GiveChar_usage); + if (targetPlayer == null) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Target_needed); return; } + int avatarId; + int level = 1; + switch (args.size()) { + case 2: + try { + level = Integer.parseInt(args.get(1)); + } catch (NumberFormatException ignored) { + // TODO: Parse from avatar name using GM Handbook. + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_avatar_level); + return; + } // Cheeky fall-through to parse first argument too + case 1: + try { + avatarId = Integer.parseInt(args.get(0)); + } catch (NumberFormatException ignored) { + // TODO: Parse from avatar name using GM Handbook. + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_avatar_id); + return; + } + break; default: CommandHandler.sendMessage(sender, Grasscutter.getLanguage().GiveChar_usage); return; - case 2: - try { - target = Integer.parseInt(args.get(0)); - if (Grasscutter.getGameServer().getPlayerByUid(target) == null && sender != null) { - target = sender.getUid(); - level = Integer.parseInt(args.get(1)); - avatarId = Integer.parseInt(args.get(0)); - } else { - avatarId = Integer.parseInt(args.get(1)); - } - } catch (NumberFormatException ignored) { - // TODO: Parse from avatar name using GM Handbook. - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().GiveChar_invalid_avatar_or_player_id); - return; - } - break; - case 3: - try { - target = Integer.parseInt(args.get(0)); - if (Grasscutter.getGameServer().getPlayerByUid(target) == null) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_playerId); - return; - } - - avatarId = Integer.parseInt(args.get(1)); - level = Integer.parseInt(args.get(2)); - } catch (NumberFormatException ignored) { - // TODO: Parse from avatar name using GM Handbook. - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().GiveChar_invalid_avatar_or_player_id); - return; - } - break; - } - - if (targetPlayer == null) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Player_not_found); - return; } AvatarData avatarData = GameData.getAvatarDataMap().get(avatarId); if (avatarData == null) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().GiveChar_invalid_avatar_id); + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_avatar_id); return; } // Check level. if (level > 90) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().GiveChar_invalid_avatar_level); + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_avatar_level); return; } // Calculate ascension level. + int ascension; if (level <= 40) { ascension = (int) Math.ceil(level / 20f); } else { @@ -93,6 +75,6 @@ public final class GiveCharCommand implements CommandHandler { avatar.recalcStats(); targetPlayer.addAvatar(avatar); - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().GiveChar_given.replace("{avatarId}", Integer.toString(avatarId)).replace("{level}", Integer.toString(level)).replace("{target}", Integer.toString(target))); + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().GiveChar_given.replace("{avatarId}", Integer.toString(avatarId)).replace("{level}", Integer.toString(level)).replace("{target}", Integer.toString(targetPlayer.getUid()))); } } diff --git a/src/main/java/emu/grasscutter/command/commands/GiveCommand.java b/src/main/java/emu/grasscutter/command/commands/GiveCommand.java index 71c8e7f0e..122b556a1 100644 --- a/src/main/java/emu/grasscutter/command/commands/GiveCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/GiveCommand.java @@ -13,119 +13,58 @@ import emu.grasscutter.game.props.ActionReason; import java.util.LinkedList; import java.util.List; -@Command(label = "give", usage = "give [player] [amount] [level]", description = "Gives an item to you or the specified player", aliases = { +@Command(label = "give", usage = "give [amount] [level]", description = "Gives an item to you or the specified player", aliases = { "g", "item", "giveitem"}, permission = "player.give") public final class GiveCommand implements CommandHandler { @Override public void execute(Player sender, Player targetPlayer, List args) { - int target, item, lvl, amount = 1, refinement = 0; - if (sender == null && args.size() < 2) { - CommandHandler.sendMessage(null, Grasscutter.getLanguage().Give_usage); + if (targetPlayer == null) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Target_needed); return; } + int item; + int lvl = 1; + int amount = 1; + int refinement = 0; switch (args.size()) { - default: // *No args* - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Give_usage); - return; + case 4: // [amount] [level] [refinement] + try { + refinement = Integer.parseInt(args.get(3)); + } catch (NumberFormatException ignored) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_item_refinement); + return; + } // Fallthrough + case 3: // [amount] [level] + try { + lvl = Integer.parseInt(args.get(2)); + } catch (NumberFormatException ignored) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_item_level); + return; + } // Fallthrough + case 2: // [amount] + try { + amount = Integer.parseInt(args.get(1)); + } catch (NumberFormatException ignored) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_amount); + return; + } // Fallthrough case 1: // try { item = Integer.parseInt(args.get(0)); - target = sender.getUid(); - lvl = 1; } catch (NumberFormatException ignored) { // TODO: Parse from item name using GM Handbook. CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_item_id); return; } break; - case 2: // [amount] | [player] - try { - target = Integer.parseInt(args.get(0)); - lvl = 1; - - if (Grasscutter.getGameServer().getPlayerByUid(target) == null && sender != null) { - target = sender.getUid(); - item = Integer.parseInt(args.get(0)); - amount = Integer.parseInt(args.get(1)); - } else { - item = Integer.parseInt(args.get(1)); - } - } catch (NumberFormatException ignored) { - // TODO: Parse from item name using GM Handbook. - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_item_or_player_id); - return; - } - break; - case 3: // [player] [amount] | [amount] [level] - try { - target = Integer.parseInt(args.get(0)); - - if (Grasscutter.getGameServer().getPlayerByUid(target) == null && sender != null) { - target = sender.getUid(); - item = Integer.parseInt(args.get(0)); - amount = Integer.parseInt(args.get(1)); - lvl = Integer.parseInt(args.get(2)); - } else { - item = Integer.parseInt(args.get(1)); - amount = Integer.parseInt(args.get(2)); - lvl = 1; - } - - } catch (NumberFormatException ignored) { - // TODO: Parse from item name using GM Handbook. - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_item_or_player_id); - return; - } - break; - case 4: // [player] [amount] [level] | [amount] [level] [refinement] - try { - target = Integer.parseInt(args.get(0)); - - if (Grasscutter.getGameServer().getPlayerByUid(target) == null && sender != null) { - target = sender.getUid(); - item = Integer.parseInt(args.get(0)); - amount = Integer.parseInt(args.get(1)); - lvl = Integer.parseInt(args.get(2)); - refinement = Integer.parseInt(args.get(3)); - } else { - item = Integer.parseInt(args.get(1)); - amount = Integer.parseInt(args.get(2)); - lvl = Integer.parseInt(args.get(3)); - } - } catch (NumberFormatException ignored) { - // TODO: Parse from item name using GM Handbook. - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_item_or_player_id); - return; - } - break; - case 5: // [player] [amount] [level] [refinement] - try { - target = Integer.parseInt(args.get(0)); - - if (Grasscutter.getGameServer().getPlayerByUid(target) == null) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_playerId); - return; - } else { - item = Integer.parseInt(args.get(1)); - amount = Integer.parseInt(args.get(2)); - lvl = Integer.parseInt(args.get(3)); - refinement = Integer.parseInt(args.get(4)); - } - } catch (NumberFormatException ignored) { - // TODO: Parse from item name using GM Handbook. - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_item_or_player_id); - return; - } - break; + default: // *No args* + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Give_usage); + return; } - if (targetPlayer == null) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Player_not_found); - return; - } ItemData itemData = GameData.getItemDataMap().get(item); if (itemData == null) { @@ -147,9 +86,9 @@ public final class GiveCommand implements CommandHandler { this.item(targetPlayer, itemData, amount, lvl, refinement); if (!itemData.isEquip()) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Give_given.replace("{amount}", Integer.toString(amount)).replace("{item}", Integer.toString(item)).replace("{target}", Integer.toString(target))); + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Give_given.replace("{amount}", Integer.toString(amount)).replace("{item}", Integer.toString(item)).replace("{target}", Integer.toString(targetPlayer.getUid()))); } else if (itemData.getItemType() == ItemType.ITEM_WEAPON) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Give_given_with_level_and_refinement.replace("{item}", Integer.toString(item)).replace("{lvl}", Integer.toString(lvl)).replace("{refinement}", Integer.toString(refinement)).replace("{amount}", Integer.toString(amount)).replace("{target}", Integer.toString(target))); + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Give_given_with_level_and_refinement.replace("{item}", Integer.toString(item)).replace("{lvl}", Integer.toString(lvl)).replace("{refinement}", Integer.toString(refinement)).replace("{amount}", Integer.toString(amount)).replace("{target}", Integer.toString(targetPlayer.getUid()))); } else { CommandHandler.sendMessage(sender,Grasscutter.getLanguage().Give_given_level.replace("{item}", Integer.toString(item)).replace("{lvl}", Integer.toString(lvl)).replace("{amount}", Integer.toString(amount))); } diff --git a/src/main/java/emu/grasscutter/command/commands/GodModeCommand.java b/src/main/java/emu/grasscutter/command/commands/GodModeCommand.java index b4c78dccd..824fc73b5 100644 --- a/src/main/java/emu/grasscutter/command/commands/GodModeCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/GodModeCommand.java @@ -7,37 +7,34 @@ import emu.grasscutter.game.player.Player; import java.util.List; -@Command(label = "godmode", usage = "godmode [playerId]", - description = "Prevents you from taking damage", permission = "player.godmode") +@Command(label = "godmode", usage = "godmode [on|off|toggle]", + description = "Prevents you from taking damage. Defaults to toggle.", permission = "player.godmode") public final class GodModeCommand implements CommandHandler { @Override public void execute(Player sender, Player targetPlayer, List args) { - if (sender == null) { - CommandHandler.sendMessage(null, Grasscutter.getLanguage().Run_this_command_in_game); - return; // TODO: toggle player's godmode statue from console or other players - } - - int target; - if (args.size() == 1) { - try { - target = Integer.parseInt(args.get(0)); - if (Grasscutter.getGameServer().getPlayerByUid(target) == null) { - target = sender.getUid(); - } - } catch (NumberFormatException e) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_playerId); - return; - } - } else { - target = sender.getUid(); - } if (targetPlayer == null) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Player_not_found); + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Target_needed); return; } - targetPlayer.setGodmode(!targetPlayer.inGodmode()); - sender.dropMessage(Grasscutter.getLanguage().Godmode_status.replace("{status}", (targetPlayer.inGodmode() ? Grasscutter.getLanguage().Enabled : Grasscutter.getLanguage().Disabled)).replace("{name}", targetPlayer.getNickname())); + boolean enabled = !targetPlayer.inGodmode(); + if (args.size() == 1) { + switch (args.get(0).toLowerCase()) { + case "on": + enabled = true; + break; + case "off": + enabled = false; + break; + case "toggle": + break; // Already toggled + default: + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Godmode_status); + } + } + + targetPlayer.setGodmode(enabled); + sender.dropMessage(Grasscutter.getLanguage().Godmode_status.replace("{status}", (enabled ? Grasscutter.getLanguage().Enabled : Grasscutter.getLanguage().Disabled)).replace("{name}", targetPlayer.getNickname())); } } diff --git a/src/main/java/emu/grasscutter/command/commands/HealCommand.java b/src/main/java/emu/grasscutter/command/commands/HealCommand.java index 3965540e9..e61cfd98f 100644 --- a/src/main/java/emu/grasscutter/command/commands/HealCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/HealCommand.java @@ -15,12 +15,12 @@ import java.util.List; public final class HealCommand implements CommandHandler { @Override public void execute(Player sender, Player targetPlayer, List args) { - if (sender == null) { - CommandHandler.sendMessage(null, Grasscutter.getLanguage().Run_this_command_in_game); + if (targetPlayer == null) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Target_needed); return; } - sender.getTeamManager().getActiveTeam().forEach(entity -> { + targetPlayer.getTeamManager().getActiveTeam().forEach(entity -> { boolean isAlive = entity.isAlive(); entity.setFightProperty( FightProperty.FIGHT_PROP_CUR_HP, diff --git a/src/main/java/emu/grasscutter/command/commands/KickCommand.java b/src/main/java/emu/grasscutter/command/commands/KickCommand.java index 30b9ff624..0e3bb6c2b 100644 --- a/src/main/java/emu/grasscutter/command/commands/KickCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/KickCommand.java @@ -7,23 +7,21 @@ import emu.grasscutter.game.player.Player; import java.util.List; -@Command(label = "kick", usage = "kick ", +@Command(label = "kick", usage = "kick", description = "Kicks the specified player from the server (WIP)", permission = "server.kick") public final class KickCommand implements CommandHandler { @Override public void execute(Player sender, Player targetPlayer, List args) { - int target = Integer.parseInt(args.get(0)); - if (targetPlayer == null) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Player_not_found); + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Target_needed); return; } if (sender != null) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Kick_player_kick_player.replace("{sendUid}", Integer.toString(sender.getAccount().getPlayerUid())).replace("{sendName}", sender.getAccount().getUsername()).replace("kickUid", Integer.toString(target)).replace("{kickName}", targetPlayer.getAccount().getUsername())); + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Kick_player_kick_player.replace("{sendUid}", Integer.toString(sender.getAccount().getPlayerUid())).replace("{sendName}", sender.getAccount().getUsername()).replace("kickUid", Integer.toString(targetPlayer.getUid())).replace("{kickName}", targetPlayer.getAccount().getUsername())); } else { - CommandHandler.sendMessage(null, Grasscutter.getLanguage().Kick_server_player.replace("{kickUid}", Integer.toString(target)).replace("{kickName}", targetPlayer.getAccount().getUsername())); + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Kick_server_player.replace("{kickUid}", Integer.toString(targetPlayer.getUid())).replace("{kickName}", targetPlayer.getAccount().getUsername())); } targetPlayer.getSession().close(); diff --git a/src/main/java/emu/grasscutter/command/commands/KillAllCommand.java b/src/main/java/emu/grasscutter/command/commands/KillAllCommand.java index fd6d36011..0e3660c1b 100644 --- a/src/main/java/emu/grasscutter/command/commands/KillAllCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/KillAllCommand.java @@ -10,57 +10,43 @@ import emu.grasscutter.game.world.Scene; import java.util.List; -@Command(label = "killall", usage = "killall [playerUid] [sceneId]", +@Command(label = "killall", usage = "killall [sceneId]", description = "Kill all entities", permission = "server.killall") public final class KillAllCommand implements CommandHandler { @Override public void execute(Player sender, Player targetPlayer, List args) { - Scene mainScene; + if (targetPlayer == null) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Target_needed); + return; + } + Scene scene = targetPlayer.getScene(); try { switch (args.size()) { case 0: // *No args* - if (sender == null) { - CommandHandler.sendMessage(null, Grasscutter.getLanguage().Kill_usage); - return; - } - mainScene = sender.getScene(); break; - case 1: // [playerUid] - targetPlayer = Grasscutter.getGameServer().getPlayerByUid(Integer.parseInt(args.get(0))); - if (targetPlayer == null) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Player_not_found_or_offline); - return; - } - mainScene = targetPlayer.getScene(); - break; - case 2: // [playerUid] [sceneId] - targetPlayer = Grasscutter.getGameServer().getPlayerByUid(Integer.parseInt(args.get(0))); - if (targetPlayer == null) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Player_not_found_or_offline); - return; - } - Scene scene = sender.getWorld().getSceneById(Integer.parseInt(args.get(1))); - if (scene == null) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Kill_scene_not_found_in_player_world); - return; - } - mainScene = scene; + case 1: // [sceneId] + scene = targetPlayer.getWorld().getSceneById(Integer.parseInt(args.get(0))); break; default: CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Kill_usage); return; } - - // Separate into list to avoid concurrency issue - List toKill = mainScene.getEntities().values().stream() - .filter(entity -> entity instanceof EntityMonster) - .toList(); - toKill.stream().forEach(entity -> mainScene.killEntity(entity, 0)); - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Kill_kill_monsters_in_scene.replace("{size}", Integer.toString(toKill.size())).replace("{id}", Integer.toString(mainScene.getId()))); } catch (NumberFormatException ignored) { CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_arguments); } + if (scene == null) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Kill_scene_not_found_in_player_world); + return; + } + + // Separate into list to avoid concurrency issue + final Scene sceneF = scene; + List toKill = sceneF.getEntities().values().stream() + .filter(entity -> entity instanceof EntityMonster) + .toList(); + toKill.stream().forEach(entity -> sceneF.killEntity(entity, 0)); + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Kill_kill_monsters_in_scene.replace("{size}", Integer.toString(toKill.size())).replace("{id}", Integer.toString(scene.getId()))); } } diff --git a/src/main/java/emu/grasscutter/command/commands/KillCharacterCommand.java b/src/main/java/emu/grasscutter/command/commands/KillCharacterCommand.java index aa3671bcb..7dc01363d 100644 --- a/src/main/java/emu/grasscutter/command/commands/KillCharacterCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/KillCharacterCommand.java @@ -12,44 +12,14 @@ import emu.grasscutter.server.packet.send.PacketLifeStateChangeNotify; import java.util.List; -@Command(label = "killcharacter", usage = "killcharacter [playerId]", aliases = {"suicide", "kill"}, +@Command(label = "killcharacter", usage = "killcharacter", aliases = {"suicide", "kill"}, description = "Kills the players current character", permission = "player.killcharacter") public final class KillCharacterCommand implements CommandHandler { @Override public void execute(Player sender, Player targetPlayer, List args) { - int target; - if (sender == null) { - // from console - if (args.size() == 1) { - try { - target = Integer.parseInt(args.get(0)); - } catch (NumberFormatException e) { - CommandHandler.sendMessage(null, Grasscutter.getLanguage().Invalid_playerId); - return; - } - } else { - CommandHandler.sendMessage(null, Grasscutter.getLanguage().KillCharacter_usage); - return; - } - } else { - if (args.size() == 1) { - try { - target = Integer.parseInt(args.get(0)); - if (Grasscutter.getGameServer().getPlayerByUid(target) == null) { - target = sender.getUid(); - } - } catch (NumberFormatException e) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_playerId); - return; - } - } else { - target = sender.getUid(); - } - } - if (targetPlayer == null) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Player_not_found_or_offline); + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Target_needed); return; } diff --git a/src/main/java/emu/grasscutter/command/commands/PermissionCommand.java b/src/main/java/emu/grasscutter/command/commands/PermissionCommand.java index b76d50da5..6e041f338 100644 --- a/src/main/java/emu/grasscutter/command/commands/PermissionCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/PermissionCommand.java @@ -8,22 +8,26 @@ import emu.grasscutter.game.player.Player; import java.util.List; -@Command(label = "permission", usage = "permission ", +@Command(label = "permission", usage = "permission ", description = "Grants or removes a permission for a user", permission = "*") public final class PermissionCommand implements CommandHandler { @Override public void execute(Player sender, Player targetPlayer, List args) { - if (args.size() < 3) { + if (targetPlayer == null) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Target_needed); + return; + } + + if (args.size() != 2) { CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Permission_usage); return; } String action = args.get(0); - String username = args.get(1); - String permission = args.get(2); + String permission = args.get(1); - Account account = Grasscutter.getGameServer().getAccountByName(username); + Account account = targetPlayer.getAccount(); if (account == null) { CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Account_not_find); return; diff --git a/src/main/java/emu/grasscutter/command/commands/PositionCommand.java b/src/main/java/emu/grasscutter/command/commands/PositionCommand.java index 14e3a896d..85f2d6bc4 100644 --- a/src/main/java/emu/grasscutter/command/commands/PositionCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/PositionCommand.java @@ -4,6 +4,7 @@ import emu.grasscutter.Grasscutter; import emu.grasscutter.command.Command; import emu.grasscutter.command.CommandHandler; import emu.grasscutter.game.player.Player; +import emu.grasscutter.utils.Position; import java.util.List; @@ -13,11 +14,12 @@ public final class PositionCommand implements CommandHandler { @Override public void execute(Player sender, Player targetPlayer, List args) { - if (sender == null) { - CommandHandler.sendMessage(null, Grasscutter.getLanguage().Run_this_command_in_game); + if (targetPlayer == null) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Target_needed); return; } - sender.dropMessage(Grasscutter.getLanguage().Position_message.replace("{x}", Float.toString(sender.getPos().getX())).replace("{y}", Float.toString(sender.getPos().getY())).replace("{z}", Float.toString(sender.getPos().getZ())).replace("{id}", Integer.toString(sender.getSceneId()))); + Position pos = targetPlayer.getPos(); + sender.dropMessage(Grasscutter.getLanguage().Position_message.replace("{x}", Float.toString(pos.getX())).replace("{y}", Float.toString(pos.getY())).replace("{z}", Float.toString(pos.getZ())).replace("{id}", Integer.toString(sender.getSceneId()))); } } diff --git a/src/main/java/emu/grasscutter/command/commands/ResetConstCommand.java b/src/main/java/emu/grasscutter/command/commands/ResetConstCommand.java index 90b542cef..6d58f8328 100644 --- a/src/main/java/emu/grasscutter/command/commands/ResetConstCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/ResetConstCommand.java @@ -16,16 +16,16 @@ public final class ResetConstCommand implements CommandHandler { @Override public void execute(Player sender, Player targetPlayer, List args) { - if (sender == null) { - CommandHandler.sendMessage(null, Grasscutter.getLanguage().Run_this_command_in_game); + if (targetPlayer == null) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Target_needed); return; } if (args.size() > 0 && args.get(0).equalsIgnoreCase("all")) { - sender.getAvatars().forEach(this::resetConstellation); - sender.dropMessage(Grasscutter.getLanguage().ResetConst_reset_all); + targetPlayer.getAvatars().forEach(this::resetConstellation); + targetPlayer.dropMessage(Grasscutter.getLanguage().ResetConst_reset_all); } else { - EntityAvatar entity = sender.getTeamManager().getCurrentAvatarEntity(); + EntityAvatar entity = targetPlayer.getTeamManager().getCurrentAvatarEntity(); if (entity == null) { return; } diff --git a/src/main/java/emu/grasscutter/command/commands/ResetShopLimitCommand.java b/src/main/java/emu/grasscutter/command/commands/ResetShopLimitCommand.java index 69170db65..f2cbf3476 100644 --- a/src/main/java/emu/grasscutter/command/commands/ResetShopLimitCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/ResetShopLimitCommand.java @@ -12,14 +12,8 @@ import java.util.List; public final class ResetShopLimitCommand implements CommandHandler { @Override public void execute(Player sender, Player targetPlayer, List args) { - if (args.size() < 1) { - CommandHandler.sendMessage(sender,Grasscutter.getLanguage().ResetShopLimit_usage); - return; - } - - int target = Integer.parseInt(args.get(0)); if (targetPlayer == null) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Player_not_found); + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Target_needed); return; } diff --git a/src/main/java/emu/grasscutter/command/commands/SendMailCommand.java b/src/main/java/emu/grasscutter/command/commands/SendMailCommand.java index d62eeba0e..da0414f79 100644 --- a/src/main/java/emu/grasscutter/command/commands/SendMailCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/SendMailCommand.java @@ -108,40 +108,44 @@ public final class SendMailCommand implements CommandHandler { mailBuilder.constructionStage++; } case 3 -> { - // Literally just copy-pasted from the give command lol. - int item, lvl, amount = 1; + int item; + int lvl = 1; + int amount = 1; + int refinement = 0; switch (args.size()) { - default -> { // *No args* - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().SendMail_usage); - return; - } - case 1 -> { // + case 4: // [amount] [level] [refinement] // TODO: this requires Mail support but there's no harm leaving it here for now + try { + refinement = Integer.parseInt(args.get(3)); + } catch (NumberFormatException ignored) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_item_refinement); + return; + } // Fallthrough + case 3: // [amount] [level] + try { + lvl = Integer.parseInt(args.get(2)); + } catch (NumberFormatException ignored) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_item_level); + return; + } // Fallthrough + case 2: // [amount] + try { + amount = Integer.parseInt(args.get(1)); + } catch (NumberFormatException ignored) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_amount); + return; + } // Fallthrough + case 1: // try { item = Integer.parseInt(args.get(0)); - lvl = 1; } catch (NumberFormatException ignored) { // TODO: Parse from item name using GM Handbook. CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_item_id); return; } - } - case 2 -> { // [amount] - lvl = 1; - item = Integer.parseInt(args.get(0)); - amount = Integer.parseInt(args.get(1)); - } - case 3 -> { // [amount] [level] - try { - item = Integer.parseInt(args.get(0)); - amount = Integer.parseInt(args.get(1)); - lvl = Integer.parseInt(args.get(2)); - - } catch (NumberFormatException ignored) { - // TODO: Parse from item name using GM Handbook. - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_item_or_player_id); - return; - } - } + break; + default: // *No args* + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Give_usage); + return; } mailBuilder.mail.itemList.add(new Mail.MailItem(item, amount, lvl)); CommandHandler.sendMessage(sender, Grasscutter.getLanguage().SendMail_send.replace("{amount}", Integer.toString(amount)).replace("{item}", Integer.toString(item)).replace("{lvl}", Integer.toString(lvl))); diff --git a/src/main/java/emu/grasscutter/command/commands/SendMessageCommand.java b/src/main/java/emu/grasscutter/command/commands/SendMessageCommand.java index 3d023000a..e04d3817e 100644 --- a/src/main/java/emu/grasscutter/command/commands/SendMessageCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/SendMessageCommand.java @@ -7,30 +7,23 @@ import emu.grasscutter.game.player.Player; import java.util.List; -@Command(label = "say", usage = "say ", description = "Sends a message to a player as the server", +@Command(label = "say", usage = "say ", description = "Sends a message to a player as the server", aliases = {"sendservmsg", "sendservermessage", "sendmessage"}, permission = "server.sendmessage") public final class SendMessageCommand implements CommandHandler { @Override public void execute(Player sender, Player targetPlayer, List args) { - if (args.size() < 2) { + if (targetPlayer == null) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Target_needed); + return; + } + if (args.size() == 0) { CommandHandler.sendMessage(null, Grasscutter.getLanguage().SendMessage_usage); return; } - try { - int target = Integer.parseInt(args.get(0)); - String message = String.join(" ", args.subList(1, args.size())); - - if (targetPlayer == null) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Player_not_found); - return; - } - - CommandHandler.sendMessage(targetPlayer, message); - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().SenaMessage_message_sent); - } catch (NumberFormatException ignored) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_playerId); - } + String message = String.join(" ", args); + CommandHandler.sendMessage(targetPlayer, message); + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().SenaMessage_message_sent); } } \ No newline at end of file diff --git a/src/main/java/emu/grasscutter/command/commands/SetFetterLevelCommand.java b/src/main/java/emu/grasscutter/command/commands/SetFetterLevelCommand.java index 43326ca17..f1768c72d 100644 --- a/src/main/java/emu/grasscutter/command/commands/SetFetterLevelCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/SetFetterLevelCommand.java @@ -17,12 +17,12 @@ public final class SetFetterLevelCommand implements CommandHandler { @Override public void execute(Player sender, Player targetPlayer, List args) { - if (sender == null) { - CommandHandler.sendMessage(null, Grasscutter.getLanguage().Run_this_command_in_game); + if (targetPlayer == null) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Target_needed); return; } - if (args.size() < 1) { + if (args.size() != 1) { CommandHandler.sendMessage(sender, Grasscutter.getLanguage().SetFetterLevel_usage); return; } @@ -33,7 +33,7 @@ public final class SetFetterLevelCommand implements CommandHandler { CommandHandler.sendMessage(sender, Grasscutter.getLanguage().SetFetterLevel_fetter_level_must_between_0_and_10); return; } - Avatar avatar = sender.getTeamManager().getCurrentAvatarEntity().getAvatar(); + Avatar avatar = targetPlayer.getTeamManager().getCurrentAvatarEntity().getAvatar(); avatar.setFetterLevel(fetterLevel); if (fetterLevel != 10) { @@ -41,7 +41,7 @@ public final class SetFetterLevelCommand implements CommandHandler { } avatar.save(); - sender.sendPacket(new PacketAvatarFetterDataNotify(avatar)); + targetPlayer.sendPacket(new PacketAvatarFetterDataNotify(avatar)); CommandHandler.sendMessage(sender, Grasscutter.getLanguage().SetFetterLevel_fetter_set_level.replace("{level}", Integer.toString(fetterLevel))); } catch (NumberFormatException ignored) { CommandHandler.sendMessage(sender, Grasscutter.getLanguage().SetFetterLevel_invalid_fetter_level); diff --git a/src/main/java/emu/grasscutter/command/commands/SetStatsCommand.java b/src/main/java/emu/grasscutter/command/commands/SetStatsCommand.java index fa7637d7b..48dbe141f 100644 --- a/src/main/java/emu/grasscutter/command/commands/SetStatsCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/SetStatsCommand.java @@ -13,7 +13,7 @@ import emu.grasscutter.game.props.FightProperty; import emu.grasscutter.languages.Language; import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify; -@Command(label = "setstats", usage = "setstats|stats [@UID] ", +@Command(label = "setstats", usage = "setstats|stats ", description = "Set fight property for your current active character", aliases = {"stats"}, permission = "player.setstats") public final class SetStatsCommand implements CommandHandler { class Stat { @@ -182,7 +182,7 @@ public final class SetStatsCommand implements CommandHandler { String valueStr; if (targetPlayer == null) { - CommandHandler.sendMessage(sender, usage); + CommandHandler.sendMessage(sender, lang.Target_needed); return; } @@ -209,8 +209,6 @@ public final class SetStatsCommand implements CommandHandler { CommandHandler.sendMessage(sender, lang.SetStats_value_error); return; } - - if (stats.containsKey(statStr)) { Stat stat = stats.get(statStr); diff --git a/src/main/java/emu/grasscutter/command/commands/SetWorldLevelCommand.java b/src/main/java/emu/grasscutter/command/commands/SetWorldLevelCommand.java index 64819a60e..74880a16b 100644 --- a/src/main/java/emu/grasscutter/command/commands/SetWorldLevelCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/SetWorldLevelCommand.java @@ -14,9 +14,9 @@ public final class SetWorldLevelCommand implements CommandHandler { @Override public void execute(Player sender, Player targetPlayer, List args) { - if (sender == null) { - CommandHandler.sendMessage(null, Grasscutter.getLanguage().Run_this_command_in_game); - return; // TODO: set player's world level from console or other players + if (targetPlayer == null) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Target_needed); + return; } if (args.size() < 1) { @@ -32,8 +32,8 @@ public final class SetWorldLevelCommand implements CommandHandler { } // Set in both world and player props - sender.getWorld().setWorldLevel(level); - sender.setWorldLevel(level); + targetPlayer.getWorld().setWorldLevel(level); + targetPlayer.setWorldLevel(level); sender.dropMessage(Grasscutter.getLanguage().SetWorldLevel_set_world_level.replace("{level}", Integer.toString(level))); } catch (NumberFormatException ignored) { diff --git a/src/main/java/emu/grasscutter/command/commands/SpawnCommand.java b/src/main/java/emu/grasscutter/command/commands/SpawnCommand.java index 2eb9f6f95..48d6235cb 100644 --- a/src/main/java/emu/grasscutter/command/commands/SpawnCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/SpawnCommand.java @@ -14,6 +14,7 @@ import emu.grasscutter.game.player.Player; import emu.grasscutter.game.props.EntityType; import emu.grasscutter.game.props.FightProperty; import emu.grasscutter.utils.Position; +import emu.grasscutter.game.world.Scene; import javax.swing.text.html.parser.Entity; import java.util.List; @@ -25,64 +26,80 @@ public final class SpawnCommand implements CommandHandler { @Override public void execute(Player sender, Player targetPlayer, List args) { - if (sender == null) { - CommandHandler.sendMessage(null, Grasscutter.getLanguage().Run_this_command_in_game); + if (targetPlayer == null) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Target_needed); return; } - if (args.size() < 1) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Spawn_usage); - return; - } - - try { - int id = Integer.parseInt(args.get(0)); - int amount = args.size() > 1 ? Integer.parseInt(args.get(1)) : 1; - int level = args.size() > 2 ? Integer.parseInt(args.get(2)) : 1; - - MonsterData monsterData = GameData.getMonsterDataMap().get(id); - GadgetData gadgetData = GameData.getGadgetDataMap().get(id); - ItemData itemData = GameData.getItemDataMap().get(id); - if (monsterData == null && gadgetData == null && itemData == null) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_entity_id); + int id = 0; // This is just to shut up the linter, it's not a real default + int amount = 1; + int level = 1; + switch (args.size()) { + case 3: + try { + level = Integer.parseInt(args.get(2)); + } catch (NumberFormatException ignored) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_arguments); + } // Fallthrough + case 2: + try { + amount = Integer.parseInt(args.get(1)); + } catch (NumberFormatException ignored) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_amount); + } // Fallthrough + case 1: + try { + id = Integer.parseInt(args.get(0)); + } catch (NumberFormatException ignored) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_entity_id); + } + break; + default: + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Spawn_usage); return; - } - - double maxRadius = Math.sqrt(amount * 0.2 / Math.PI); - for (int i = 0; i < amount; i++) { - Position pos = GetRandomPositionInCircle(sender.getPos(), maxRadius).addY(3); - GameEntity entity = null; - if (itemData != null) { - entity = new EntityItem(sender.getScene(), null, itemData, pos, 1, true); - } - if (gadgetData != null) { - entity = new EntityVehicle(sender.getScene(), sender.getSession().getPlayer(), gadgetData.getId(), 0, pos, sender.getRotation()); - int gadgetId = gadgetData.getId(); - switch (gadgetId) { - // TODO: Not hardcode this. Waverider (skiff) - case 45001001, 45001002 -> { - entity.addFightProperty(FightProperty.FIGHT_PROP_BASE_HP, 10000); - entity.addFightProperty(FightProperty.FIGHT_PROP_BASE_ATTACK, 100); - entity.addFightProperty(FightProperty.FIGHT_PROP_CUR_ATTACK, 100); - entity.addFightProperty(FightProperty.FIGHT_PROP_CUR_HP, 10000); - entity.addFightProperty(FightProperty.FIGHT_PROP_CUR_DEFENSE, 0); - entity.addFightProperty(FightProperty.FIGHT_PROP_CUR_SPEED, 0); - entity.addFightProperty(FightProperty.FIGHT_PROP_CHARGE_EFFICIENCY, 0); - entity.addFightProperty(FightProperty.FIGHT_PROP_MAX_HP, 10000); - } - default -> {} - } - } - if (monsterData != null) { - entity = new EntityMonster(sender.getScene(), monsterData, pos, level); - } - - sender.getScene().addEntity(entity); - } - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Spawn_message.replace("{amount}", Integer.toString(amount)).replace("{id}", Integer.toString(id))); - } catch (NumberFormatException ignored) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_entity_id); } + + MonsterData monsterData = GameData.getMonsterDataMap().get(id); + GadgetData gadgetData = GameData.getGadgetDataMap().get(id); + ItemData itemData = GameData.getItemDataMap().get(id); + if (monsterData == null && gadgetData == null && itemData == null) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_entity_id); + return; + } + Scene scene = targetPlayer.getScene(); + + double maxRadius = Math.sqrt(amount * 0.2 / Math.PI); + for (int i = 0; i < amount; i++) { + Position pos = GetRandomPositionInCircle(targetPlayer.getPos(), maxRadius).addY(3); + GameEntity entity = null; + if (itemData != null) { + entity = new EntityItem(scene, null, itemData, pos, 1, true); + } + if (gadgetData != null) { + entity = new EntityVehicle(scene, targetPlayer.getSession().getPlayer(), gadgetData.getId(), 0, pos, targetPlayer.getRotation()); // TODO: does targetPlayer.getSession().getPlayer() have some meaning? + int gadgetId = gadgetData.getId(); + switch (gadgetId) { + // TODO: Not hardcode this. Waverider (skiff) + case 45001001, 45001002 -> { + entity.addFightProperty(FightProperty.FIGHT_PROP_BASE_HP, 10000); + entity.addFightProperty(FightProperty.FIGHT_PROP_BASE_ATTACK, 100); + entity.addFightProperty(FightProperty.FIGHT_PROP_CUR_ATTACK, 100); + entity.addFightProperty(FightProperty.FIGHT_PROP_CUR_HP, 10000); + entity.addFightProperty(FightProperty.FIGHT_PROP_CUR_DEFENSE, 0); + entity.addFightProperty(FightProperty.FIGHT_PROP_CUR_SPEED, 0); + entity.addFightProperty(FightProperty.FIGHT_PROP_CHARGE_EFFICIENCY, 0); + entity.addFightProperty(FightProperty.FIGHT_PROP_MAX_HP, 10000); + } + default -> {} + } + } + if (monsterData != null) { + entity = new EntityMonster(scene, monsterData, pos, level); + } + + scene.addEntity(entity); + } + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Spawn_message.replace("{amount}", Integer.toString(amount)).replace("{id}", Integer.toString(id))); } private Position GetRandomPositionInCircle(Position origin, double radius){ diff --git a/src/main/java/emu/grasscutter/command/commands/TalentCommand.java b/src/main/java/emu/grasscutter/command/commands/TalentCommand.java index ec5828261..6d6535e9a 100644 --- a/src/main/java/emu/grasscutter/command/commands/TalentCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/TalentCommand.java @@ -15,11 +15,37 @@ import java.util.List; @Command(label = "talent", usage = "talent ", description = "Set talent level for your current active character", permission = "player.settalent") public final class TalentCommand implements CommandHandler { + private void setTalentLevel(Player sender, Player player, Avatar avatar, int talentId, int talentLevel) { + int oldLevel = avatar.getSkillLevelMap().get(talentId); + if (talentLevel < 0 || talentLevel > 15) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Talent_lower_16); + return; + } + + // Upgrade skill + avatar.getSkillLevelMap().put(talentLevel, talentLevel); + avatar.save(); + + // Packet + player.sendPacket(new PacketAvatarSkillChangeNotify(avatar, talentId, oldLevel, talentLevel)); + player.sendPacket(new PacketAvatarSkillUpgradeRsp(avatar, talentId, oldLevel, talentLevel)); + + String successMessage = Grasscutter.getLanguage().Talent_set_id.replace("{id}", Integer.toString(talentId)); + AvatarSkillDepotData depot = avatar.getData().getSkillDepot(); + if (talentId == depot.getSkills().get(0)) { + successMessage = Grasscutter.getLanguage().Talent_set_atk; + } else if (talentId == depot.getSkills().get(1)) { + successMessage = Grasscutter.getLanguage().Talent_set_e; + } else if (talentId == depot.getEnergySkill()) { + successMessage = Grasscutter.getLanguage().Talent_set_q; + } + CommandHandler.sendMessage(sender, successMessage.replace("{level}", Integer.toString(talentLevel))); + } @Override public void execute(Player sender, Player targetPlayer, List args) { - if (sender == null) { - CommandHandler.sendMessage(null, Grasscutter.getLanguage().Run_this_command_in_game); + if (targetPlayer == null) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Target_needed); return; } @@ -30,6 +56,8 @@ public final class TalentCommand implements CommandHandler { return; } + EntityAvatar entity = sender.getTeamManager().getCurrentAvatarEntity(); + Avatar avatar = entity.getAvatar(); String cmdSwitch = args.get(0); switch (cmdSwitch) { default: @@ -38,112 +66,59 @@ public final class TalentCommand implements CommandHandler { CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Talent_usage_3); return; case "set": - try { - int skillId = Integer.parseInt(args.get(1)); - int nextLevel = Integer.parseInt(args.get(2)); - EntityAvatar entity = sender.getTeamManager().getCurrentAvatarEntity(); - Avatar avatar = entity.getAvatar(); - int skillIdNorAtk = avatar.getData().getSkillDepot().getSkills().get(0); - int skillIdE = avatar.getData().getSkillDepot().getSkills().get(1); - int skillIdQ = avatar.getData().getSkillDepot().getEnergySkill(); - int currentLevelNorAtk = avatar.getSkillLevelMap().get(skillIdNorAtk); - int currentLevelE = avatar.getSkillLevelMap().get(skillIdE); - int currentLevelQ = avatar.getSkillLevelMap().get(skillIdQ); - if (args.size() < 2){ - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Talent_usage_1); - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Talent_usage_3); - return; - } - if (nextLevel >= 16){ - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Talent_lower_16); - return; - } - if (skillId == skillIdNorAtk){ - // Upgrade skill - avatar.getSkillLevelMap().put(skillIdNorAtk, nextLevel); - avatar.save(); - - // Packet - sender.sendPacket(new PacketAvatarSkillChangeNotify(avatar, skillIdNorAtk, currentLevelNorAtk, nextLevel)); - sender.sendPacket(new PacketAvatarSkillUpgradeRsp(avatar, skillIdNorAtk, currentLevelNorAtk, nextLevel)); - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Talent_set_atk.replace("{level}", Integer.toString(nextLevel))); - } - if (skillId == skillIdE){ - // Upgrade skill - avatar.getSkillLevelMap().put(skillIdE, nextLevel); - avatar.save(); - - // Packet - sender.sendPacket(new PacketAvatarSkillChangeNotify(avatar, skillIdE, currentLevelE, nextLevel)); - sender.sendPacket(new PacketAvatarSkillUpgradeRsp(avatar, skillIdE, currentLevelE, nextLevel)); - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Talent_set_e.replace("{level}", Integer.toString(nextLevel))); - } - if (skillId == skillIdQ){ - // Upgrade skill - avatar.getSkillLevelMap().put(skillIdQ, nextLevel); - avatar.save(); - - // Packet - sender.sendPacket(new PacketAvatarSkillChangeNotify(avatar, skillIdQ, currentLevelQ, nextLevel)); - sender.sendPacket(new PacketAvatarSkillUpgradeRsp(avatar, skillIdQ, currentLevelQ, nextLevel)); - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Talent_set_q.replace("{level}", Integer.toString(nextLevel))); - } - - } catch (NumberFormatException ignored) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Talent_invalid_skill_id); - return; - } - - break; - case "n": case "e": case "q": + if (args.size() < 3){ + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Talent_usage_1); + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Talent_usage_3); + return; + } + try { - EntityAvatar entity = sender.getTeamManager().getCurrentAvatarEntity(); - Avatar avatar = entity.getAvatar(); - AvatarSkillDepotData SkillDepot = avatar.getData().getSkillDepot(); - int skillId; - switch (cmdSwitch) { - default: - skillId = SkillDepot.getSkills().get(0); - break; - case "e": - skillId = SkillDepot.getSkills().get(1); - break; - case "q": - skillId = SkillDepot.getEnergySkill(); - break; - } - int nextLevel = Integer.parseInt(args.get(1)); - int currentLevel = avatar.getSkillLevelMap().get(skillId); - if (args.size() < 1){ - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Talent_usage_2); - return; - } - if (nextLevel >= 16){ - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Talent_lower_16); - return; - } - // Upgrade skill - avatar.getSkillLevelMap().put(skillId, nextLevel); - avatar.save(); - // Packet - sender.sendPacket(new PacketAvatarSkillChangeNotify(avatar, skillId, currentLevel, nextLevel)); - sender.sendPacket(new PacketAvatarSkillUpgradeRsp(avatar, skillId, currentLevel, nextLevel)); - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Talent_set_this.replace("{level}", Integer.toString(nextLevel))); + int skillId = Integer.parseInt(args.get(1)); + int newLevel = Integer.parseInt(args.get(2)); + setTalentLevel(sender, targetPlayer, avatar, skillId, newLevel); + } catch (NumberFormatException ignored) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Talent_invalid_skill_id); + return; + } + break; + case "n": + case "e": + case "q": + if (args.size() < 2){ + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Talent_usage_2); + return; + } + + AvatarSkillDepotData SkillDepot = avatar.getData().getSkillDepot(); + int skillId; + switch (cmdSwitch) { + default: + skillId = SkillDepot.getSkills().get(0); + break; + case "e": + skillId = SkillDepot.getSkills().get(1); + break; + case "q": + skillId = SkillDepot.getEnergySkill(); + break; + } + + try { + int newLevel = Integer.parseInt(args.get(1)); + setTalentLevel(sender, targetPlayer, avatar, skillId, newLevel); } catch (NumberFormatException ignored) { CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Talent_invalid_talent_level); return; } break; - case "getid": - EntityAvatar entity = sender.getTeamManager().getCurrentAvatarEntity(); - Avatar avatar = entity.getAvatar(); - int skillIdNorAtk = avatar.getData().getSkillDepot().getSkills().get(0); - int skillIdE = avatar.getData().getSkillDepot().getSkills().get(1); - int skillIdQ = avatar.getData().getSkillDepot().getEnergySkill(); + case "getid": + int skillIdNorAtk = avatar.getData().getSkillDepot().getSkills().get(0); + int skillIdE = avatar.getData().getSkillDepot().getSkills().get(1); + int skillIdQ = avatar.getData().getSkillDepot().getEnergySkill(); - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Talent_normal_attack_id.replace("{id}", Integer.toString(skillIdNorAtk))); - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Talent_e_skill_id.replace("{id}", Integer.toString(skillIdE))); - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Talent_q_skill_id.replace("{id}", Integer.toString(skillIdQ))); + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Talent_normal_attack_id.replace("{id}", Integer.toString(skillIdNorAtk))); + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Talent_e_skill_id.replace("{id}", Integer.toString(skillIdE))); + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Talent_q_skill_id.replace("{id}", Integer.toString(skillIdQ))); break; } } diff --git a/src/main/java/emu/grasscutter/command/commands/TeleportAllCommand.java b/src/main/java/emu/grasscutter/command/commands/TeleportAllCommand.java index 56f0f4453..4c9f2a9cd 100644 --- a/src/main/java/emu/grasscutter/command/commands/TeleportAllCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/TeleportAllCommand.java @@ -13,22 +13,22 @@ import java.util.List; public final class TeleportAllCommand implements CommandHandler { @Override public void execute(Player sender, Player targetPlayer, List args) { - if (sender == null) { - CommandHandler.sendMessage(null, Grasscutter.getLanguage().Run_this_command_in_game); + if (targetPlayer == null) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Target_needed); return; } - if (!sender.getWorld().isMultiplayer()) { + if (!targetPlayer.getWorld().isMultiplayer()) { CommandHandler.sendMessage(sender, Grasscutter.getLanguage().TeleportAll_message); return; } - for (Player player : sender.getWorld().getPlayers()) { - if (player.equals(sender)) + for (Player player : targetPlayer.getWorld().getPlayers()) { + if (player.equals(targetPlayer)) continue; - Position pos = sender.getPos(); + Position pos = targetPlayer.getPos(); - player.getWorld().transferPlayerToScene(player, sender.getSceneId(), pos); + player.getWorld().transferPlayerToScene(player, targetPlayer.getSceneId(), pos); } } } diff --git a/src/main/java/emu/grasscutter/command/commands/TeleportCommand.java b/src/main/java/emu/grasscutter/command/commands/TeleportCommand.java index 7ca7a2c33..f47ea73f6 100644 --- a/src/main/java/emu/grasscutter/command/commands/TeleportCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/TeleportCommand.java @@ -8,83 +8,62 @@ import emu.grasscutter.utils.Position; import java.util.List; -@Command(label = "teleport", usage = "teleport [@player id] [scene id]", aliases = {"tp"}, +@Command(label = "teleport", usage = "teleport [scene id]", aliases = {"tp"}, description = "Change the player's position.", permission = "player.teleport") public final class TeleportCommand implements CommandHandler { + private float parseRelative(String input, Float current) { // TODO: Maybe this will be useful elsewhere later + if (input.contains("~")) { // Relative + if (!input.equals("~")) { // Relative with offset + current += Float.parseFloat(input.replace("~", "")); + } // Else no offset, no modification + } else { // Absolute + current = Float.parseFloat(input); + } + return current; + } + @Override public void execute(Player sender, Player targetPlayer, List args) { - int target; - if (args.size() < (sender == null ? 4 : 3)) { - CommandHandler.sendMessage(sender, sender == null ? Grasscutter.getLanguage().Teleport_usage_server : - Grasscutter.getLanguage().Teleport_usage); - return; - } - if (args.get(0).startsWith("@")) { - try { - target = Integer.parseInt(args.get(0).substring(1)); - } catch (NumberFormatException e) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_playerId); - return; - } - } else { - if (sender == null) { - CommandHandler.sendMessage(null, Grasscutter.getLanguage().Teleport_specify_player_id); - return; - } - target = sender.getUid(); - } - if (targetPlayer == null) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Player_not_found_or_offline); + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Target_needed); return; } - args = args.subList(args.get(0).startsWith("@") ? 1 : 0, args.size()); - try { - float x = 0f; - float y = 0f; - float z = 0f; - if (args.get(0).contains("~")) { - if (args.get(0).equals("~")) { - x = targetPlayer.getPos().getX(); - } else { - x = Float.parseFloat(args.get(0).replace("~", "")) + targetPlayer.getPos().getX(); + Position pos = targetPlayer.getPos(); + float x = pos.getX(); + float y = pos.getY(); + float z = pos.getZ(); + int sceneId = targetPlayer.getSceneId(); + + switch (args.size()) { + case 4: + try { + sceneId = Integer.parseInt(args.get(3)); + }catch (NumberFormatException ignored) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_arguments); + } // Fallthrough + case 3: + try { + x = parseRelative(args.get(0), x); + y = parseRelative(args.get(0), y); + z = parseRelative(args.get(0), z); + } catch (NumberFormatException ignored) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Teleport_invalid_position); } - } else { - x = Float.parseFloat(args.get(0)); - } - if (args.get(1).contains("~")) { - if (args.get(1).equals("~")) { - y = targetPlayer.getPos().getY(); - } else { - y = Float.parseFloat(args.get(1).replace("~", "")) + targetPlayer.getPos().getY(); - } - } else { - y = Float.parseFloat(args.get(1)); - } - if (args.get(2).contains("~")) { - if (args.get(2).equals("~")) { - z = targetPlayer.getPos().getZ(); - } else { - z = Float.parseFloat(args.get(2).replace("~", "")) + targetPlayer.getPos().getZ(); - } - } else { - z = Float.parseFloat(args.get(2)); - } - int sceneId = targetPlayer.getSceneId(); - if (args.size() == 4){ - sceneId = Integer.parseInt(args.get(3)); - } - Position target_pos = new Position(x, y, z); - boolean result = targetPlayer.getWorld().transferPlayerToScene(targetPlayer, sceneId, target_pos); - if (!result) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Teleport_invalid_position); - } else { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Teleport_message.replace("{name}", targetPlayer.getNickname()).replace("{x}", Float.toString(x)).replace("{y}", Float.toString(y)).replace("{z}", Float.toString(z)).replace("{id}", Integer.toString(sceneId))); - } - } catch (NumberFormatException ignored) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Teleport_invalid_position); + break; + default: + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Teleport_usage); + return; } + + Position target_pos = new Position(x, y, z); + boolean result = targetPlayer.getWorld().transferPlayerToScene(targetPlayer, sceneId, target_pos); + if (!result) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Teleport_invalid_position); + } else { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Teleport_message.replace("{name}", targetPlayer.getNickname()).replace("{x}", Float.toString(x)).replace("{y}", Float.toString(y)).replace("{z}", Float.toString(z)).replace("{id}", Integer.toString(sceneId))); + } + } } diff --git a/src/main/java/emu/grasscutter/command/commands/WeatherCommand.java b/src/main/java/emu/grasscutter/command/commands/WeatherCommand.java index c85359a24..c389eb428 100644 --- a/src/main/java/emu/grasscutter/command/commands/WeatherCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/WeatherCommand.java @@ -15,28 +15,38 @@ public final class WeatherCommand implements CommandHandler { @Override public void execute(Player sender, Player targetPlayer, List args) { - if (sender == null) { - CommandHandler.sendMessage(null, Grasscutter.getLanguage().Run_this_command_in_game); + if (targetPlayer == null) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Target_needed); return; } - if (args.size() < 1) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Weather_usage); - return; + int weatherId = 0; + int climateId = 1; + switch (args.size()) { + case 2: + try { + climateId = Integer.parseInt(args.get(1)); + } catch (NumberFormatException ignored) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Weather_invalid_id); + } + case 1: + try { + weatherId = Integer.parseInt(args.get(0)); + } catch (NumberFormatException ignored) { + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Weather_invalid_id); + } + break; + default: + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Weather_usage); + return; } - try { - int weatherId = Integer.parseInt(args.get(0)); - int climateId = args.size() > 1 ? Integer.parseInt(args.get(1)) : 1; + ClimateType climate = ClimateType.getTypeByValue(climateId); - ClimateType climate = ClimateType.getTypeByValue(climateId); + sender.getScene().setWeather(weatherId); + sender.getScene().setClimate(climate); + sender.getScene().broadcastPacket(new PacketSceneAreaWeatherNotify(sender)); + CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Weather_message.replace("{weatherId}", Integer.toString(weatherId)).replace("{climateId}", Integer.toString(climateId))); - sender.getScene().setWeather(weatherId); - sender.getScene().setClimate(climate); - sender.getScene().broadcastPacket(new PacketSceneAreaWeatherNotify(sender)); - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Weather_message.replace("{weatherId}", Integer.toString(weatherId)).replace("{climateId}", Integer.toString(climateId))); - } catch (NumberFormatException ignored) { - CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Weather_invalid_id); - } } } diff --git a/src/main/java/emu/grasscutter/languages/Language.java b/src/main/java/emu/grasscutter/languages/Language.java index 50f269ad3..53e99d24f 100644 --- a/src/main/java/emu/grasscutter/languages/Language.java +++ b/src/main/java/emu/grasscutter/languages/Language.java @@ -45,21 +45,28 @@ public final class Language { public String You_not_permission_run_command = "You do not have permission to run this command."; public String This_command_can_only_run_from_console = "This command can only be run from the console."; public String Run_this_command_in_game = "Run this command in-game."; + public String Invalid_amount = "Invalid amount."; + public String Invalid_arguments = "Invalid arguments."; + public String Invalid_artifact_id = "Invalid artifact ID."; + public String Invalid_avatar_id = "Invalid avatar id."; + public String Invalid_avatar_level = "Invalid avatar level."; + public String Invalid_entity_id = "Invalid entity id."; + public String Invalid_item_id = "Invalid item id."; + public String Invalid_item_level = "Invalid item level."; + public String Invalid_item_refinement = "Invalid item refinement level."; public String Invalid_playerId = "Invalid playerId."; + public String Invalid_UID = "Invalid UID."; public String Player_not_found = "Player not found."; public String Player_is_offline = "Player is offline."; - public String Invalid_item_id = "Invalid item id."; - public String Invalid_item_or_player_id = "Invalid item or player ID."; public String Enabled = "enabled"; public String Disabled = "disabled"; public String No_command_found = "No command found."; public String Help = "Help"; public String Player_not_found_or_offline = "Player not found or offline."; - public String Invalid_arguments = "Invalid arguments."; public String Success = "Success"; - public String Invalid_entity_id = "Invalid entity id."; public String Target_cleared = "Target cleared."; public String Target_set = "Subsequent commands will target @{uid} by default."; + public String Target_needed = "This command requires a target UID. Add a <@UID> argument or set a persistent target with /target @UID."; // Help public String Help_usage = " Usage: "; @@ -68,7 +75,6 @@ public final class Language { // Account public String Modify_user_account = "Modify user accounts"; - public String Invalid_UID = "Invalid UID."; public String Account_exists = "Account already exists."; public String Account_create_UID = "Account created with UID {uid}."; public String Account_delete = "Account deleted."; @@ -86,6 +92,7 @@ public final class Language { public String Change_screen_not_exist = "Scene does not exist"; // Clear + public String Clear_usage = "Usage: clear "; public String Clear_weapons = "Cleared weapons for {name} ."; public String Clear_artifacts = "Cleared artifacts for {name} ."; public String Clear_materials = "Cleared materials for {name} ."; @@ -95,7 +102,8 @@ public final class Language { public String Clear_everything = "Cleared everything for {name} ."; // Coop - public String Coop_usage = "Usage: coop "; + public String Coop_usage = "Usage: coop "; + public String Coop_success = "Summoned {target} to {host}'s world."; // Drop public String Drop_usage = "Usage: drop [amount]"; @@ -108,22 +116,17 @@ public final class Language { public String EnterDungeon_you_in_that_dungeon = "You are already in that dungeon"; // GiveAll - public String GiveAll_usage = "Usage: giveall [player] [amount]"; + public String GiveAll_usage = "Usage: giveall [amount]"; public String GiveAll_item = "Giving all items..."; public String GiveAll_done = "Giving all items done"; - public String GiveAll_invalid_amount_or_playerId = "Invalid amount or player ID."; // GiveArtifact public String GiveArtifact_usage = "Usage: giveart|gart [player] [[,]]... [level]"; - public String GiveArtifact_invalid_artifact_id = "Invalid artifact ID."; public String GiveArtifact_given = "Given {itemId} to {target}."; // GiveChar public String GiveChar_usage = "Usage: givechar [amount]"; public String GiveChar_given = "Given {avatarId} with level {level} to {target}."; - public String GiveChar_invalid_avatar_id = "Invalid avatar id."; - public String GiveChar_invalid_avatar_level = "Invalid avatar level."; - public String GiveChar_invalid_avatar_or_player_id = "Invalid avatar or player ID."; // Give public String Give_usage = "Usage: give [amount] [level]"; @@ -134,7 +137,8 @@ public final class Language { public String Give_given_level = "Given {item} with level {lvl} {amount} times to {target}"; // GodMode - public String Godmode_status = "Godmode is now {status} for {name} ."; + public String Godmode_usage = "Usage: godmode [on|off|toggle]"; + public String Godmode_status = "Godmode is now {status} for {name}."; // Heal public String Heal_message = "All characters have been healed."; @@ -156,7 +160,7 @@ public final class Language { public String List_message = "There are {size} player(s) online:"; // Permission - public String Permission_usage = "Usage: permission "; + public String Permission_usage = "Usage: permission "; public String Permission_add = "Permission added."; public String Permission_have_permission = "They already have this permission!"; public String Permission_remove = "Permission removed."; @@ -270,6 +274,7 @@ public final class Language { public String Talent_usage_2 = "Another way to set talent level: /talent "; public String Talent_usage_3 = "To get talent ID: /talent getid"; public String Talent_lower_16 = "Invalid talent level. Level should be lower than 16"; + public String Talent_set_id = "Set talent {id} to {level}."; public String Talent_set_atk = "Set talent Normal ATK to {level}."; public String Talent_set_e = "Set talent E to {level}."; public String Talent_set_q = "Set talent Q to {level}."; @@ -284,9 +289,7 @@ public final class Language { public String TeleportAll_message = "You only can use this command in MP mode."; // Teleport - public String Teleport_usage_server = "Usage: /tp @ [scene id]"; - public String Teleport_usage = "Usage: /tp [@] [scene id]"; - public String Teleport_specify_player_id = "You must specify a player id."; + public String Teleport_usage = "Usage: /tp [scene id]"; public String Teleport_invalid_position = "Invalid position."; public String Teleport_message = "Teleported {name} to {x},{y},{z} in scene {id}";