Add /npc attribute

main/pom.xml

@@ -9,7 +9,7 @@
     <artifactId>citizens-main</artifactId>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <craftbukkit.version>1.20.5-R0.1-SNAPSHOT</craftbukkit.version>
+        <craftbukkit.version>1.20.6-R0.1-SNAPSHOT</craftbukkit.version>
         <placeholderapi.version>2.11.5</placeholderapi.version>
         <citizensapi.version>${project.version}</citizensapi.version>
         <worldguard.version>7.1.0-SNAPSHOT</worldguard.version>

main/src/main/java/net/citizensnpcs/commands/NPCCommands.java

@@ -27,6 +27,7 @@ import org.bukkit.OfflinePlayer;
 import org.bukkit.Rotation;
 import org.bukkit.Sound;
 import org.bukkit.World;
+import org.bukkit.attribute.Attribute;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.command.CommandSender;
@@ -63,6 +64,7 @@ import net.citizensnpcs.api.CitizensAPI;
 import net.citizensnpcs.api.ai.speech.SpeechContext;
 import net.citizensnpcs.api.ai.tree.StatusMapper;
 import net.citizensnpcs.api.command.Arg;
+import net.citizensnpcs.api.command.Arg.CompletionsProvider;
 import net.citizensnpcs.api.command.Command;
 import net.citizensnpcs.api.command.CommandContext;
 import net.citizensnpcs.api.command.CommandMessages;
@@ -112,6 +114,7 @@ import net.citizensnpcs.npc.NPCSelector;
 import net.citizensnpcs.trait.Age;
 import net.citizensnpcs.trait.Anchors;
 import net.citizensnpcs.trait.ArmorStandTrait;
+import net.citizensnpcs.trait.AttributeTrait;
 import net.citizensnpcs.trait.BoundingBoxTrait;
 import net.citizensnpcs.trait.ClickRedirectTrait;
 import net.citizensnpcs.trait.CommandTrait;
@@ -396,6 +399,27 @@ public class NPCCommands {
         }
     }
 
+    @Command(
+            aliases = { "npc" },
+            usage = "attribute [attribute] [value]",
+            desc = "",
+            modifiers = { "attribute" },
+            min = 2,
+            max = 3,
+            permission = "citizens.npc.attribute")
+    public void attribute(CommandContext args, CommandSender sender, NPC npc,
+            @Arg(value = 1, completionsProvider = OptionalAttributeCompletions.class) String attribute,
+            @Arg(2) Double value) {
+        AttributeTrait trait = npc.getOrAddTrait(AttributeTrait.class);
+        if (value == null) {
+            trait.setDefaultAttribute(Attribute.valueOf(attribute));
+            Messaging.sendTr(sender, Messages.ATTRIBUTE_RESET, attribute);
+        } else {
+            trait.setAttributeValue(Attribute.valueOf(attribute), value);
+            Messaging.sendTr(sender, Messages.ATTRIBUTE_SET, attribute, value);
+        }
+    }
+
     @Command(
             aliases = { "npc" },
             usage = "breakblock --location [x,y,z] --radius [radius]",
@@ -3544,4 +3568,22 @@ public class NPCCommands {
         Messaging.sendTr(sender, Messages.WOLF_TRAIT_UPDATED, npc.getName(), trait.isAngry(), trait.isSitting(),
                 trait.isTamed(), trait.getCollarColor().name());
     }
+
+    @SuppressWarnings("unchecked")
+    public static class OptionalAttributeCompletions implements CompletionsProvider {
+        @Override
+        public Collection<String> getCompletions(CommandContext args, CommandSender sender, NPC npc) {
+            if (CLAZZ == null)
+                return Collections.emptyList();
+            return Lists.transform(Arrays.asList(CLAZZ.getEnumConstants()), Enum::name);
+        }
+
+        private static Class<? extends Enum<?>> CLAZZ;
+        static {
+            try {
+                CLAZZ = (Class<? extends Enum<?>>) Class.forName("org.bukkit.attribute.Attribute");
+            } catch (ClassNotFoundException e) {
+            }
+        }
+    }
 }

main/src/main/java/net/citizensnpcs/npc/CitizensTraitFactory.java

@@ -18,10 +18,11 @@ import net.citizensnpcs.api.trait.trait.Inventory;
 import net.citizensnpcs.api.trait.trait.MobType;
 import net.citizensnpcs.api.trait.trait.Owner;
 import net.citizensnpcs.api.trait.trait.PlayerFilter;
-import net.citizensnpcs.api.trait.trait.Spawned; 
+import net.citizensnpcs.api.trait.trait.Spawned;
 import net.citizensnpcs.trait.Age;
 import net.citizensnpcs.trait.Anchors;
 import net.citizensnpcs.trait.ArmorStandTrait;
+import net.citizensnpcs.trait.AttributeTrait;
 import net.citizensnpcs.trait.BoundingBoxTrait;
 import net.citizensnpcs.trait.ClickRedirectTrait;
 import net.citizensnpcs.trait.CommandTrait;
@@ -74,6 +75,7 @@ public class CitizensTraitFactory implements TraitFactory {
     public CitizensTraitFactory(Citizens plugin) {
         registerTrait(TraitInfo.create(Age.class));
         registerTrait(TraitInfo.create(ArmorStandTrait.class));
+        registerTrait(TraitInfo.create(AttributeTrait.class));
         registerTrait(TraitInfo.create(Anchors.class));
         registerTrait(TraitInfo.create(BoundingBoxTrait.class));
         registerTrait(TraitInfo.create(ClickRedirectTrait.class));
@@ -95,7 +97,7 @@ public class CitizensTraitFactory implements TraitFactory {
         registerTrait(TraitInfo.create(ItemFrameTrait.class));
         registerTrait(TraitInfo.create(LookClose.class));
         registerTrait(TraitInfo.create(PaintingTrait.class));
-        registerTrait(TraitInfo.create(MirrorTrait.class).optInToStats()); 
+        registerTrait(TraitInfo.create(MirrorTrait.class).optInToStats());
         registerTrait(TraitInfo.create(MountTrait.class));
         registerTrait(TraitInfo.create(MobType.class).asDefaultTrait());
         registerTrait(TraitInfo.create(OcelotModifiers.class));

main/src/main/java/net/citizensnpcs/trait/AttributeTrait.java

@@ -0,0 +1,48 @@
+package net.citizensnpcs.trait;
+
+import java.util.Map;
+
+import org.bukkit.attribute.Attribute;
+import org.bukkit.attribute.AttributeInstance;
+import org.bukkit.entity.LivingEntity;
+
+import com.google.common.collect.Maps;
+
+import net.citizensnpcs.api.persistence.Persist;
+import net.citizensnpcs.api.trait.Trait;
+import net.citizensnpcs.api.trait.TraitName;
+
+@TraitName("attributetrait")
+public class AttributeTrait extends Trait {
+    @Persist
+    private final Map<Attribute, Double> attributes = Maps.newEnumMap(Attribute.class);
+
+    public AttributeTrait() {
+        super("attributetrait");
+    }
+
+    @Override
+    public void onSpawn() {
+        if (!(npc.getEntity() instanceof LivingEntity))
+            return;
+        LivingEntity le = (LivingEntity) npc.getEntity();
+        for (Map.Entry<Attribute, Double> entry : attributes.entrySet()) {
+            le.getAttribute(entry.getKey()).setBaseValue(entry.getValue());
+        }
+    }
+
+    public void setAttributeValue(Attribute attribute, double value) {
+        attributes.put(attribute, value);
+        onSpawn();
+    }
+
+    public void setDefaultAttribute(Attribute attribute) {
+        attributes.remove(attribute);
+        if (!(npc.getEntity() instanceof LivingEntity))
+            return;
+
+        LivingEntity le = (LivingEntity) npc.getEntity();
+        AttributeInstance instance = le.getAttribute(attribute);
+        instance.setBaseValue(instance.getDefaultValue());
+    }
+}

main/src/main/java/net/citizensnpcs/util/Messages.java

@@ -20,6 +20,8 @@ public class Messages {
     public static final String ANIMATION_ADDED = "citizens.editors.waypoints.triggers.animation.added";
     public static final String ANIMATION_TRIGGER_PROMPT = "citizens.editors.waypoints.triggers.animation.prompt";
     public static final String ARMADILLO_STATE_SET = "citizens.commands.npc.armadillo.state-set";
+    public static final String ATTRIBUTE_RESET = "citizens.commands.npc.attribute.reset";
+    public static final String ATTRIBUTE_SET = "citizens.commands.npc.attribute.set";
     public static final String AVAILABLE_WAYPOINT_PROVIDERS = "citizens.waypoints.available-providers-header";
     public static final String AXOLOTL_NOT_PLAYING_DEAD = "citizens.commands.npc.axolotl.playing-dead-stopped";
     public static final String AXOLOTL_PLAYING_DEAD = "citizens.commands.npc.axolotl.playing-dead";

main/src/main/resources/en.json

@@ -31,6 +31,9 @@
   "citizens.commands.npc.aggressive.description" : "Sets the aggressive status of the entity",
   "citizens.commands.npc.aggressive.help" : "",
   "citizens.commands.npc.ai.description" : "Sets whether the NPC should use vanilla AI",
+  "citizens.commands.npc.attribute.set" : "Attribute [[{0}]] set to base value [[{1}]].",
+  "citizens.commands.npc.attribute.reset" : "Attribute [[{0}]] reset to default value.",
+  "citizens.commands.npc.attribute.description" : "Set various NPC attributes",
   "citizens.commands.npc.ai.help" : "",
   "citizens.commands.npc.ai.started" : "Now using Minecraft AI.",
   "citizens.commands.npc.ai.stopped" : "No longer using Minecraft AI.",