From a3dd54757e9744d24dcea8fc1dab62fb495c4e7a Mon Sep 17 00:00:00 2001 From: aPunch Date: Sat, 14 Jan 2012 22:41:02 -0600 Subject: [PATCH] added names --- lib/CitizensAPI.jar | Bin 13349 -> 13392 bytes src/net/citizensnpcs/npc/CitizensNPC.java | 22 ++++++++++++++++-- .../citizensnpcs/npc/CitizensNPCManager.java | 15 ++++++------ 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/lib/CitizensAPI.jar b/lib/CitizensAPI.jar index 1180a67ad90cf2bbccfd1675dfe90c8a8ac2501a..264c07ee147f473323dbce1fe0f8e8714de73a5a 100644 GIT binary patch delta 1120 zcmZ3QaUp{zz?+$civa|#ZkfoV$#iAQM)OA^f>*cbIXFGPyJ`y~1H&0+1_q_cg_1Ip zPwR8mPYsOq7j_h}ZQgSG(yCA|)}#D(S8|p74lNdn^YEBua&^fu_WOC|$KM_>y8Xt_ z`;h(o(Wsh|Gt$(-WzbALbob3LD7cg6dMYun42dOdC)&XnPQ;ljD) zZ{GioG?iqdi88lBX200naC}MAgVfKryZ-BM{vEr(E%8Uau4*ppuDbgg+RV9MXBy3% z$ue_E=d_xMX3IU?OE#%(w~z?-Y7AX@fSs?X{ae#nM(s84TABF&d&;v%Fypg>nfFvEw8gCdL(4d@VV?D`)Wq_tp~3U9m1=)R!T^7-_O6S;Ci9TFISM#eqSi(rw^RtE_r!+zNw=Wc&p@$!RcoOMkzZ~JV^O^>G)-}%Q4 zi)RjCJnK1pIwCeB3>dXqEDQ{q;HZ^05U5`oblU5%gUH_C+efarzup~PIC)pW0_}xC zEsGW$VLvjp%YfH;j+xJ?l%NZ9e}wD(VX*hwGk4mq%vlbbXIQ6OJfC-X@6Vrqf3Y=) zndIEq{;;7zSmT_@{=M&oGIqwz@0IAC!LxGx)Cq~ZUwW>~RM=AS+-Txqg@rj98gUv~ zw^-&q@2KBo8fCaJ^ZQgyv5a+}ZrAHw{ioUg%fRk)aD?LZG?(^wp?W{>d`%L)6lW!| zfO&e<3-ec1GGHC~}8EkF(%Dg&t1Mlj~uVzHGnqFDE zcomB@TmHF%vk!jpC|pXutB$ypkfz|6LJ zsm5zIUX*0!Ac(vnYgE(#R}6d7^~$WN8B{rUeo}rpe@P11+XTNgz{i@&ZZT z$=U`ylm8jWG37~t6;6=mne1w4!qg%SGe)q&K*7FztKAZTWR&7eZ zW4zjtnlDd%-1qa6;Qf>T^O;?i+X&b2R5ei$gF6rzm zE3-9uNvB_xt#P@t@yK0%SVVF#eC^P4V0?ZlFBlkiUzjJ`u}gy@ZnBlQV13|eufq-^ zdxLKuyW;+OxA#%sl7|i23xiq~B&_7`&}L1PYO~0lapmNa1=jVaTjd|PcbZ?03V#`L zCh6Urf_Ikb@BaR&`p?jioME-$?EyYU^N=~2b+xaBZ+zw3H7Q$)OE+$(&r<^*O=+$! z@va`R#=h_~7rHoo|Ee#GSg|uJ^60$!{|es{7TmB#93S4-wv!Z%Fnx9wxxyg=eJKhxKZlc#D} z0<+KN3mUK4cv14tEuR( zc*d~F4-L|ooTb3h^Ne^V7Z{o_MM^`tqLVL3vrWEZsKwMG0~L~;>|o@`lpzo0`ZC2S uPF`rNIGNAbk||dS$W)u0Z*0I=HhF<@9MfhMu$;82 traits = new HashSet(); private Character character = null; + private final Set traits = new HashSet(); + private String name; private CraftNPC mcEntity; private boolean spawned; private final CitizensNPCManager manager; - protected CitizensNPC(Character character, Trait... traits) { + protected CitizensNPC(String name, Character character, Trait... traits) { + this.name = name; this.character = character; for (Trait trait : traits) { this.traits.add(trait); @@ -33,6 +36,21 @@ public class CitizensNPC implements NPC { id = manager.getUniqueID(); } + @Override + public String getFullName() { + return name; + } + + @Override + public String getName() { + return ChatColor.stripColor(name); + } + + @Override + public void setName(String name) { + this.name = name; + } + @Override public void addTrait(Trait trait) { if (!hasTrait(trait)) diff --git a/src/net/citizensnpcs/npc/CitizensNPCManager.java b/src/net/citizensnpcs/npc/CitizensNPCManager.java index 4a3e0b226..2be316dd0 100644 --- a/src/net/citizensnpcs/npc/CitizensNPCManager.java +++ b/src/net/citizensnpcs/npc/CitizensNPCManager.java @@ -29,18 +29,18 @@ public class CitizensNPCManager implements NPCManager { private Map byID = new HashMap(); @Override - public NPC createNPC() { - return createNPC(null); + public NPC createNPC(String name) { + return createNPC(name, null); } @Override - public NPC createNPC(Character character) { - return createNPC(character); + public NPC createNPC(String name, Character character) { + return createNPC(name, character); } @Override - public NPC createNPC(Character character, Trait... traits) { - CitizensNPC npc = new CitizensNPC(character, traits); + public NPC createNPC(String name, Character character, Trait... traits) { + CitizensNPC npc = new CitizensNPC(name, character, traits); byID.put(npc.getId(), npc); return npc; } @@ -100,7 +100,8 @@ public class CitizensNPCManager implements NPCManager { public CraftNPC spawn(NPC npc) { Location loc = ((LocationTrait) npc.getTrait("location")).getLocation(); WorldServer ws = getWorldServer(loc.getWorld()); - CraftNPC mcEntity = new CraftNPC(getMinecraftServer(ws.getServer()), ws, "", new ItemInWorldManager(ws)); + CraftNPC mcEntity = new CraftNPC(getMinecraftServer(ws.getServer()), ws, npc.getFullName(), + new ItemInWorldManager(ws)); mcEntity.setPositionRotation(loc.getX(), loc.getY(), loc.getZ(), loc.getYaw(), loc.getPitch()); ws.addEntity(mcEntity); ws.players.remove(mcEntity);