Upstream
/
Citizens2
mirror of https://github.com/CitizensDev/Citizens2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add toggle trait command back

This commit is contained in:
fullwall 2024-03-03 14:57:51 +08:00
parent 0491f5ed20
commit 40c6b4b85e
2 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
main/src/main/java/net/citizensnpcs/commands/TraitCommands.java
View File

@ -132,4 +132,46 @@ public class TraitCommands {
Bukkit.getPluginManager().callEvent(new NPCTraitCommandDetachEvent(npc, clazz, sender));
npc.removeTrait(clazz);
}
@Command(
aliases = { "trait" },
usage = "[trait name], [trait name]...",
desc = "",
modifiers = { "*" },
min = 1,
permission = "citizens.npc.trait")
public void toggle(CommandContext args, CommandSender sender, NPC npc) throws CommandException {
List<String> added = Lists.newArrayList();
List<String> removed = Lists.newArrayList();
List<String> failed = Lists.newArrayList();
for (String traitName : Splitter.on(',').split(args.getJoinedStrings(0))) {
if (!sender.hasPermission("citizens.npc.trait." + traitName)
&& !sender.hasPermission("citizens.npc.trait.*")) {
failed.add(String.format("%s: No permission", traitName));
continue;
}
Class<? extends Trait> clazz = CitizensAPI.getTraitFactory().getTraitClass(traitName);
if (clazz == null) {
failed.add(String.format("%s: Trait not found", traitName));
continue;
}
boolean remove = npc.hasTrait(clazz);
if (remove) {
removeTrait(npc, clazz, sender);
removed.add(StringHelper.wrap(traitName));
continue;
}
addTrait(npc, clazz, sender);
added.add(StringHelper.wrap(traitName));
}
if (added.size() > 0) {
Messaging.sendTr(sender, Messages.TRAITS_ADDED, Joiner.on(", ").join(added));
}
if (removed.size() > 0) {
Messaging.sendTr(sender, Messages.TRAITS_REMOVED, Joiner.on(", ").join(removed));
}
if (failed.size() > 0) {
Messaging.send(sender, "Failed to toggle traits", Joiner.on(", ").join(failed));
}
}
}

4
main/src/main/resources/en.json
View File

@ -618,8 +618,8 @@
"citizens.commands.trait.remove.description" : "Removes traits on the NPC",
"citizens.commands.trait.remove.help" : "",
"citizens.commands.trait.removed" : "Removed {0} successfully.",
"citizens.commands.trait.toggle.description" : "Toggles traits on the NPC",
"citizens.commands.trait.toggle.help" : "",
"citizens.commands.trait.*.description" : "Toggles traits on the NPC",
"citizens.commands.trait.*.help" : "",
"citizens.commands.traitc.*.description" : "Configures a trait",
"citizens.commands.traitc.*.help" : "",
"citizens.commands.traitc.missing" : "Trait not found.",