From ae4b95731b27102a4b34f9a7e5c8439d8e785dcb Mon Sep 17 00:00:00 2001 From: KAMKEEL Date: Tue, 28 Feb 2023 04:52:24 -0500 Subject: [PATCH] Fix CREATE Command --- src/main/java/kamkeel/CmdHelp.java | 14 +++++++------- src/main/java/kamkeel/CmdNPC.java | 8 +++++--- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/main/java/kamkeel/CmdHelp.java b/src/main/java/kamkeel/CmdHelp.java index 566d27574..d8c5616e1 100644 --- a/src/main/java/kamkeel/CmdHelp.java +++ b/src/main/java/kamkeel/CmdHelp.java @@ -29,9 +29,9 @@ public class CmdHelp extends CommandKamkeelBase{ @Override public void processCommand(ICommandSender sender, String[] args) throws CommandException { if(args.length == 0){ - sendMessage(sender, "------Kamkeel Commands------"); + sendMessage(sender, "\u00A78------ \u00A7cKamkeel Commands \u00A78------"); for(Entry entry : parent.map.entrySet()){ - sendMessage(sender, entry.getKey() + ": " + entry.getValue().getCommandUsage(sender)); + sendMessage(sender, "\u00A77> " + "\u00A7e" + entry.getKey() + "\u00A78: \u00A77" + entry.getValue().getCommandUsage(sender)); } return; } @@ -50,17 +50,17 @@ public class CmdHelp extends CommandKamkeelBase{ m = command.subcommands.get(args[1].toLowerCase()); } if(m == null){ - sendMessage(sender, "------" + command.getCommandName() + " SubCommands------"); + sendMessage(sender, "\u00A78------ \u00A7a" + command.getCommandName().toUpperCase() + " SubCommands \u00A78------"); for(Entry entry : command.subcommands.entrySet()){ - sender.addChatMessage(new ChatComponentTranslation(entry.getKey() + ": " + entry.getValue().getAnnotation(SubCommand.class).desc())); + sender.addChatMessage(new ChatComponentTranslation("\u00A77> " + "\u00A7e" + entry.getKey() + "\u00A78: \u00A77" + entry.getValue().getAnnotation(SubCommand.class).desc())); } } else{ - sendMessage(sender, "------" + command.getCommandName() + "." + args[1].toLowerCase() + " Command------"); + sendMessage(sender, "\u00A78------ \u00A7b" + command.getCommandName().toUpperCase() + "." + args[1].toUpperCase() + " Command \u00A78------"); SubCommand sc = m.getAnnotation(SubCommand.class); - sender.addChatMessage(new ChatComponentTranslation(sc.desc())); + sender.addChatMessage(new ChatComponentTranslation("\u00A77" + sc.desc())); if(!sc.usage().isEmpty()) - sender.addChatMessage(new ChatComponentTranslation("Usage: " + sc.usage())); + sender.addChatMessage(new ChatComponentTranslation("\u00A77Usage: \u00A76" + sc.usage())); } } } diff --git a/src/main/java/kamkeel/CmdNPC.java b/src/main/java/kamkeel/CmdNPC.java index c87dcf7d4..741874d6c 100644 --- a/src/main/java/kamkeel/CmdNPC.java +++ b/src/main/java/kamkeel/CmdNPC.java @@ -21,6 +21,7 @@ import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleCompanion; import noppes.npcs.roles.RoleFollower; +import org.apache.commons.lang3.ArrayUtils; public class CmdNPC extends CommandKamkeelBase { @@ -51,9 +52,10 @@ public class CmdNPC extends CommandKamkeelBase { public void processCommand(ICommandSender sender, String[] args) throws CommandException { String npcname = args[0].replace("%", " "); String command = args[1]; - args = Arrays.copyOfRange(args, 2, args.length); - if(command.equalsIgnoreCase("create")){ - processSubCommand(sender, command, new String[]{args[0], npcname}); + args = Arrays.copyOfRange(args, 2, args.length); + if(command.equalsIgnoreCase("create")){ + args = ArrayUtils.add(args, 0, npcname); + processSubCommand(sender, command, args); return; }