individual costs for NPC commands (#3033)

* Add individual cost option for `/npc cmd cost` * Add individual experience cost option for `/npc cmd expcost` * Begin individual item cost impl Everything is finished except for saving/loading the items. I just need to figure out how to properly save the ItemStacks either by using the DataKey or by somehow figuring out how to use the Persist API * Add item saving and loading * Add cost and exp cost to describe message * Remove debug/todo things * Make `-1` default to allow for cost-free commands * Update `describe` function to have proper space alignment * Change names of cost values * Update parameter name
CitizensDev · Jun 25, 2023 · a2d7284 · a2d7284
1 parent 053438b
commit a2d7284
Show file tree

Hide file tree

Showing 4 changed files with 183 additions and 34 deletions.
diff --git a/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java b/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
@@ -444,7 +444,7 @@ public void collidable(CommandContext args, CommandSender sender, NPC npc) throw
 
     @Command(
             aliases = { "npc" },
-            usage = "command|cmd (add [command] | remove [id] | permissions [permissions] | sequential | random | clearerror [type] (name|uuid) | errormsg [type] [msg] | persistsequence [true|false] | (exp|item)cost [cost]) (-s(hift)) (-l[eft]/-r[ight]) (-p[layer] -o[p]), --cooldown --gcooldown [seconds] --delay [ticks] --permissions [perms] --n [max # of uses]",
+            usage = "command|cmd (add [command] | remove [id] | permissions [permissions] | sequential | random | clearerror [type] (name|uuid) | errormsg [type] [msg] | persistsequence [true|false] | cost [cost] (id) | expcost [cost] (id) | itemcost (id)) (-s(hift)) (-l[eft]/-r[ight]) (-p[layer] -o[p]), --cooldown --gcooldown [seconds] --delay [ticks] --permissions [perms] --n [max # of uses]",
             desc = "Controls commands which will be run when clicking on an NPC",
             help = Messages.NPC_COMMAND_HELP,
             modifiers = { "command", "cmd" },
@@ -459,7 +459,7 @@ public void command(CommandContext args, CommandSender sender, NPC npc,
             @Arg(
                     value = 1,
                     completions = { "add", "remove", "permissions", "persistsequence", "sequential", "random",
-                            "hideerrors", "errormsg", "clearerror", "expcost", "itemcost" }) String action)
+                            "hideerrors", "errormsg", "clearerror", "expcost", "itemcost", "cost" }) String action)
             throws CommandException {
         CommandTrait commands = npc.getOrAddTrait(CommandTrait.class);
         if (args.argsLength() == 1) {
@@ -532,11 +532,29 @@ public void command(CommandContext args, CommandSender sender, NPC npc,
             Messaging.sendTr(sender, Messages.COMMAND_TEMPORARY_PERMISSIONS_SET,
                     Joiner.on(' ').join(temporaryPermissions));
         } else if (action.equalsIgnoreCase("cost")) {
-            commands.setCost(args.getDouble(2));
-            Messaging.sendTr(sender, Messages.COMMAND_COST_SET, args.getDouble(2));
+            if (args.argsLength() == 2) {
+                throw new CommandException(Messages.COMMAND_MISSING_COST);
+            }
+            if (args.argsLength() == 4) {
+                commands.setCost(args.getDouble(2), args.getInteger(3));
+                Messaging.sendTr(sender, Messages.COMMAND_INDIVIDUAL_COST_SET, args.getDouble(2) == -1 ? "-1 (default)" : args.getDouble(2), args.getInteger(3));
+            }
+            else {
+                commands.setCost(args.getDouble(2));
+                Messaging.sendTr(sender, Messages.COMMAND_COST_SET, args.getDouble(2));
+            }
         } else if (action.equalsIgnoreCase("expcost")) {
-            commands.setExperienceCost(args.getInteger(2));
-            Messaging.sendTr(sender, Messages.COMMAND_EXPERIENCE_COST_SET, args.getInteger(2));
+            if (args.argsLength() == 2) {
+                throw new CommandException(Messages.COMMAND_MISSING_COST);
+            }
+            if (args.argsLength() == 4) {
+                commands.setExperienceCost(args.getInteger(2), args.getInteger(3));
+                Messaging.sendTr(sender, Messages.COMMAND_INDIVIDUAL_EXPERIENCE_COST_SET, args.getInteger(2) == -1 ? "-1 (default)" : args.getInteger(2), args.getInteger(3));
+            }
+            else {
+                commands.setExperienceCost(args.getInteger(2));
+                Messaging.sendTr(sender, Messages.COMMAND_EXPERIENCE_COST_SET, args.getInteger(2));
+            }
         } else if (action.equalsIgnoreCase("hideerrors")) {
             commands.setHideErrorMessages(!commands.isHideErrorMessages());
             Messaging.sendTr(sender, commands.isHideErrorMessages() ? Messages.COMMAND_HIDE_ERROR_MESSAGES_SET
@@ -549,7 +567,12 @@ public void command(CommandContext args, CommandSender sender, NPC npc,
         } else if (action.equalsIgnoreCase("itemcost")) {
             if (!(sender instanceof Player))
                 throw new CommandException(CommandMessages.MUST_BE_INGAME);
-            InventoryMenu.createSelfRegistered(new ItemRequirementGUI(commands)).present(((Player) sender));
+            if (args.argsLength() == 2) {
+                InventoryMenu.createSelfRegistered(new ItemRequirementGUI(commands)).present(((Player) sender));
+            }
+            else {
+                InventoryMenu.createSelfRegistered(new ItemRequirementGUI(commands, args.getInteger(2))).present(((Player) sender));
+            }
         } else if (action.equalsIgnoreCase("errormsg")) {
             CommandTraitError which = Util.matchEnum(CommandTraitError.values(), args.getString(2));
             if (which == null)