From 7c9c8dd546920fc386270e83b2fa9282d2db600f Mon Sep 17 00:00:00 2001
From: aPunch <alexpuncochar@yahoo.com>
Date: Wed, 8 Feb 2012 09:22:42 -0600
Subject: [PATCH] added some commands, fixed bug where NPCs that despawned via
 chunk loading were deselected

---
 lib/CitizensAPI.jar                           | Bin 23702 -> 24046 bytes
 plugin.yml                                    |   1 +
 src/net/citizensnpcs/Citizens.java            |   2 ++
 .../command/command/AdminCommands.java        |  26 +++++++++++++++-
 .../command/command/HelpCommands.java         |   8 ++---
 .../command/command/NPCCommands.java          |  29 ++++++++++++++++--
 src/net/citizensnpcs/npc/CitizensNPC.java     |   8 ++++-
 .../citizensnpcs/npc/CitizensNPCManager.java  |   7 +++--
 src/net/citizensnpcs/npc/NPCInventory.java    |   6 +++-
 src/net/citizensnpcs/trait/Inventory.java     |   2 +-
 src/net/citizensnpcs/trait/LookClose.java     |   2 +-
 src/net/citizensnpcs/util/StringHelper.java   |   4 +++
 12 files changed, 81 insertions(+), 14 deletions(-)

diff --git a/lib/CitizensAPI.jar b/lib/CitizensAPI.jar
index 95400e3fceb2ead497caaf2cc13c7d524991ab9e..47e75d31d3d2fe1763e617ef9edc4302f678ac2a 100644
GIT binary patch
delta 9551
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
F{|A65bP@mn

delta 9272
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

diff --git a/plugin.yml b/plugin.yml
index 65cbaa9d2..310b62454 100644
--- a/plugin.yml
+++ b/plugin.yml
@@ -2,6 +2,7 @@ name: Citizens
 authors: [aPunch, fullwall]
 version: 2.0
 main: net.citizensnpcs.Citizens
+website: http://www.citizensnpcs.net
 commands:
   citizens:
     description: Administration commands
diff --git a/src/net/citizensnpcs/Citizens.java b/src/net/citizensnpcs/Citizens.java
index 65e64cf5e..f410ff9e9 100644
--- a/src/net/citizensnpcs/Citizens.java
+++ b/src/net/citizensnpcs/Citizens.java
@@ -20,6 +20,7 @@ import net.citizensnpcs.api.npc.trait.trait.SpawnLocation;
 import net.citizensnpcs.api.npc.trait.trait.Spawned;
 import net.citizensnpcs.command.CommandManager;
 import net.citizensnpcs.command.Injector;
+import net.citizensnpcs.command.command.AdminCommands;
 import net.citizensnpcs.command.command.HelpCommands;
 import net.citizensnpcs.command.command.NPCCommands;
 import net.citizensnpcs.command.exception.CommandUsageException;
@@ -242,6 +243,7 @@ public class Citizens extends JavaPlugin {
         cmdManager.setInjector(new Injector(this));
 
         // Register command classes
+        cmdManager.register(AdminCommands.class);
         cmdManager.register(NPCCommands.class);
         cmdManager.register(HelpCommands.class);
     }
diff --git a/src/net/citizensnpcs/command/command/AdminCommands.java b/src/net/citizensnpcs/command/command/AdminCommands.java
index 6c5717cc9..81d0164c8 100644
--- a/src/net/citizensnpcs/command/command/AdminCommands.java
+++ b/src/net/citizensnpcs/command/command/AdminCommands.java
@@ -1,9 +1,33 @@
 package net.citizensnpcs.command.command;
 
-import net.citizensnpcs.Citizens;
+import org.bukkit.entity.Player;
 
+import net.citizensnpcs.Citizens;
+import net.citizensnpcs.api.npc.NPC;
+import net.citizensnpcs.command.CommandContext;
+import net.citizensnpcs.command.annotation.Command;
+import net.citizensnpcs.command.annotation.Requirements;
+import net.citizensnpcs.util.Messaging;
+import net.citizensnpcs.util.StringHelper;
+
+@Requirements
 public class AdminCommands {
+    private final Citizens plugin;
 
     public AdminCommands(Citizens plugin) {
+        this.plugin = plugin;
+    }
+
+    @Command(
+             aliases = { "citizens" },
+             desc = "Shows basic plugin information",
+             max = 0,
+             permission = "admin")
+    @Requirements
+    public void citizens(CommandContext args, Player player, NPC npc) {
+        Messaging.send(player, "          " + StringHelper.wrapHeader("<e>Citizens v" + plugin.getDescription().getVersion()));
+        Messaging.send(player, "     <7>-- <c>Written by fullwall and aPunch");
+        Messaging.send(player, "     <7>-- <c>Source: http://github.com/CitizensDev");
+        Messaging.send(player, "     <7>-- <c>Website: " + plugin.getDescription().getWebsite());
     }
 }
\ No newline at end of file
diff --git a/src/net/citizensnpcs/command/command/HelpCommands.java b/src/net/citizensnpcs/command/command/HelpCommands.java
index 27d098abf..6adf9daf0 100644
--- a/src/net/citizensnpcs/command/command/HelpCommands.java
+++ b/src/net/citizensnpcs/command/command/HelpCommands.java
@@ -67,9 +67,9 @@ public class HelpCommands {
 
         Messaging.send(
                 player,
-                StringHelper.parseColors("<a>=====[ <e>"
+                StringHelper.wrapHeader("<e>"
                         + (baseCommand.equalsIgnoreCase("npc") ? "NPC" : StringHelper.capitalize(baseCommand
-                                .toLowerCase())) + " Help <f>" + page + "/" + pages + " <a>]====="));
+                                .toLowerCase())) + " Help <f>" + page + "/" + pages));
 
         if (lines.size() < endIndex)
             endIndex = lines.size() - 1;
@@ -85,8 +85,8 @@ public class HelpCommands {
         for (Command cmd : cmdManager.getCommands(baseCommand)) {
             if (cmds.contains(cmd) || !player.hasPermission("citizens." + cmd.permission()))
                 continue;
-            lines.add(StringHelper.parseColors("<7>/<c>" + cmd.aliases()[0] + " " + cmd.usage() + " <7>- <e>"
-                    + cmd.desc()));
+            lines.add(StringHelper.parseColors("<7>/<c>" + cmd.aliases()[0]
+                    + (cmd.usage().isEmpty() ? "" : " " + cmd.usage()) + " <7>- <e>" + cmd.desc()));
             if (cmd.modifiers().length > 1)
                 cmds.add(cmd);
         }
diff --git a/src/net/citizensnpcs/command/command/NPCCommands.java b/src/net/citizensnpcs/command/command/NPCCommands.java
index 359993fe5..9758640aa 100644
--- a/src/net/citizensnpcs/command/command/NPCCommands.java
+++ b/src/net/citizensnpcs/command/command/NPCCommands.java
@@ -109,6 +109,25 @@ public class NPCCommands {
         Messaging.send(player, ChatColor.GREEN + "You despawned " + StringHelper.wrap(npc.getName()) + ".");
     }
 
+    @Command(
+             aliases = { "npc" },
+             usage = "rename [name]",
+             desc = "Rename an NPC",
+             modifiers = { "rename" },
+             min = 2,
+             max = 2,
+             permission = "npc.rename")
+    public void renameNPC(CommandContext args, Player player, NPC npc) {
+        String oldName = npc.getName();
+        npc.setName(args.getString(1));
+        // Must reselect NPC after it is despawned
+        npcManager.selectNPC(player, npc);
+        Messaging.send(
+                player,
+                ChatColor.GREEN + "You renamed " + StringHelper.wrap(oldName) + " to "
+                        + StringHelper.wrap(args.getString(1)) + ".");
+    }
+
     @Command(
              aliases = { "npc" },
              usage = "select [id]",
@@ -189,8 +208,14 @@ public class NPCCommands {
         Messaging.send(player, ChatColor.GREEN + "You teleported to " + StringHelper.wrap(npc.getName()) + ".");
     }
 
-    @Command(aliases = { "npc" }, usage = "lookclose", desc = "Toggle an NPC's look-close state", modifiers = {
-            "lookclose", "look", "rotate" }, min = 1, max = 1, permission = "npc.look-close")
+    @Command(
+            aliases = { "npc" },
+            usage = "lookclose",
+            desc = "Toggle an NPC's look-close state",
+            modifiers = { "lookclose", "look", "rotate" },
+            min = 1,
+            max = 1,
+            permission = "npc.look-close")
     public void toggleNPCLookClose(CommandContext args, Player player, NPC npc) {
         LookClose trait = npc.getTrait(LookClose.class);
         trait.toggle();
diff --git a/src/net/citizensnpcs/npc/CitizensNPC.java b/src/net/citizensnpcs/npc/CitizensNPC.java
index 19992e9e8..cbe409634 100644
--- a/src/net/citizensnpcs/npc/CitizensNPC.java
+++ b/src/net/citizensnpcs/npc/CitizensNPC.java
@@ -39,7 +39,7 @@ public abstract class CitizensNPC extends AbstractNPC {
 
         Bukkit.getPluginManager().callEvent(new NPCDespawnEvent(this));
 
-        manager.despawn(this);
+        manager.despawn(this, getTrait(Spawned.class).shouldSpawn());
         mcEntity = null;
 
         return true;
@@ -113,4 +113,10 @@ public abstract class CitizensNPC extends AbstractNPC {
         super.update();
         ai.update();
     }
+
+    @Override
+    public void setName(String name) {
+        super.setName(name);
+        inventory.setName(name);
+    }
 }
\ No newline at end of file
diff --git a/src/net/citizensnpcs/npc/CitizensNPCManager.java b/src/net/citizensnpcs/npc/CitizensNPCManager.java
index 48073d7e8..fe9264eb9 100644
--- a/src/net/citizensnpcs/npc/CitizensNPCManager.java
+++ b/src/net/citizensnpcs/npc/CitizensNPCManager.java
@@ -50,9 +50,10 @@ public class CitizensNPCManager implements NPCManager {
         return createNPC(type, generateUniqueId(), name, character);
     }
 
-    public void despawn(NPC npc) {
+    public void despawn(NPC npc, boolean deselect) {
         npc.getTrait(SpawnLocation.class).setLocation(npc.getBukkitEntity().getLocation());
-        selected.removeAll(npc.getId());
+        if (deselect)
+            selected.removeAll(npc.getId());
         npc.getBukkitEntity().remove();
     }
 
@@ -111,7 +112,7 @@ public class CitizensNPCManager implements NPCManager {
 
     public void remove(NPC npc) {
         if (npc.isSpawned())
-            despawn(npc);
+            despawn(npc, true);
         npcs.remove(npc.getId());
         saves.getKey("npc").removeKey("" + npc.getId());
         selected.removeAll(npc.getId());
diff --git a/src/net/citizensnpcs/npc/NPCInventory.java b/src/net/citizensnpcs/npc/NPCInventory.java
index 822537a1d..877735ab0 100644
--- a/src/net/citizensnpcs/npc/NPCInventory.java
+++ b/src/net/citizensnpcs/npc/NPCInventory.java
@@ -15,9 +15,9 @@ import org.bukkit.inventory.Inventory;
 public class NPCInventory implements IInventory {
     private final int size = 36;
     private final NPC npc;
-    private final String name;
     private final ItemStack[] contents;
     private final Inventory inventory = new CraftInventory(this);
+    private String name;
 
     public NPCInventory(NPC npc) {
         this.npc = npc;
@@ -103,4 +103,8 @@ public class NPCInventory implements IInventory {
     public void show(Player player) {
         ((CraftPlayer) player).getHandle().a(this);
     }
+
+    public void setName(String name) {
+        this.name = StringHelper.parseColors(name);
+    }
 }
\ No newline at end of file
diff --git a/src/net/citizensnpcs/trait/Inventory.java b/src/net/citizensnpcs/trait/Inventory.java
index 844b0894f..1f154677c 100644
--- a/src/net/citizensnpcs/trait/Inventory.java
+++ b/src/net/citizensnpcs/trait/Inventory.java
@@ -13,7 +13,7 @@ import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;
 
 @SaveId("inventory")
-public class Inventory implements Trait {
+public class Inventory extends Trait {
     private ItemStack[] contents;
 
     public Inventory() {
diff --git a/src/net/citizensnpcs/trait/LookClose.java b/src/net/citizensnpcs/trait/LookClose.java
index a2875e3ed..1eaaae964 100644
--- a/src/net/citizensnpcs/trait/LookClose.java
+++ b/src/net/citizensnpcs/trait/LookClose.java
@@ -12,7 +12,7 @@ import net.citizensnpcs.npc.CitizensNPC;
 import net.minecraft.server.EntityLiving;
 
 @SaveId("look-close")
-public class LookClose implements Trait, Runnable {
+public class LookClose extends Trait implements Runnable {
     private final NPC npc;
     private boolean shouldLookClose;
 
diff --git a/src/net/citizensnpcs/util/StringHelper.java b/src/net/citizensnpcs/util/StringHelper.java
index 293989b11..3a6f1d2a8 100644
--- a/src/net/citizensnpcs/util/StringHelper.java
+++ b/src/net/citizensnpcs/util/StringHelper.java
@@ -73,4 +73,8 @@ public class StringHelper {
         return capitalize.replaceFirst(String.valueOf(capitalize.charAt(0)),
                 String.valueOf(Character.toUpperCase(capitalize.charAt(0))));
     }
+
+    public static String wrapHeader(Object string) {
+        return ChatColor.GREEN + "=====[ " + string.toString() + ChatColor.GREEN + " ]=====";
+    }
 }
\ No newline at end of file