diff --git a/src/main/java/net/citizensnpcs/Citizens.java b/src/main/java/net/citizensnpcs/Citizens.java index 751c50d05..bf684b5f1 100644 --- a/src/main/java/net/citizensnpcs/Citizens.java +++ b/src/main/java/net/citizensnpcs/Citizens.java @@ -56,7 +56,7 @@ public class Citizens extends JavaPlugin { private static final String COMPATIBLE_MC_VERSION = "1.1"; private volatile CitizensNPCManager npcManager; - private final InstanceFactory characterManager = DefaultInstanceFactory.create(Derp.class); + private final InstanceFactory characterManager = DefaultInstanceFactory.create(); private final InstanceFactory traitManager = DefaultInstanceFactory.create(Owner.class, Spawned.class, LookClose.class, SpawnLocation.class, Inventory.class, MobType.class); private final CommandManager commands = new CommandManager(); diff --git a/src/main/java/net/citizensnpcs/Derp.java b/src/main/java/net/citizensnpcs/Derp.java deleted file mode 100644 index 4256ab7b4..000000000 --- a/src/main/java/net/citizensnpcs/Derp.java +++ /dev/null @@ -1,108 +0,0 @@ -package net.citizensnpcs; - -import java.util.Random; - -import net.citizensnpcs.api.ai.AI; -import net.citizensnpcs.api.ai.AbstractGoal; -import net.citizensnpcs.api.ai.Goal; -import net.citizensnpcs.api.exception.NPCLoadException; -import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.api.trait.Character; -import net.citizensnpcs.api.trait.SaveId; -import net.citizensnpcs.api.util.DataKey; -import net.citizensnpcs.util.Messaging; - -import org.bukkit.ChatColor; -import org.bukkit.Location; -import org.bukkit.entity.Arrow; - -@SaveId("derp") -public class Derp extends Character { - @Override - public void load(DataKey key) throws NPCLoadException { - Messaging.log("load? derples!"); - } - - @Override - public void save(DataKey key) { - Messaging.log("save? derpin' herp!"); - } - - @Override - public void onSet(final NPC npc) { - AI ai = npc.getAI(); - final Random rand = new Random(); - ai.addGoal(0, new AbstractGoal() { - @Override - public void start() { - npc.chat("derp time!"); - } - - @Override - public void update() { - Location loc = npc.getBukkitEntity().getLocation(); - loc.setPitch(new Random().nextFloat() * 360); - loc.setYaw(new Random().nextFloat() * 360); - npc.getBukkitEntity().teleport(loc); - npc.move(rand.nextInt(3), rand.nextInt(3), rand.nextInt(3)); - } - - @Override - public boolean isCompatibleWith(Goal other) { - return false; - } - - @Override - public boolean continueExecuting() { - return rand.nextInt(100) < 80; - } - }); - ai.addGoal(1, new AbstractGoal() { - - @Override - public void update() { - int length = rand.nextInt(10); - StringBuilder builder = new StringBuilder(); - int values = ChatColor.values().length; - for (int i = 0; i <= length; ++i) { - builder.append(ChatColor.values()[rand.nextInt(values)].toString() + getRandomChar()); - } - npc.chat(builder.toString()); - } - - @Override - public boolean continueExecuting() { - return rand.nextInt(100) < 60; - } - - private char getRandomChar() { - int r = rand.nextInt(1000); - while (!java.lang.Character.isDefined(r)) { - r = rand.nextInt(1000); - } - return (char) r; - } - }); - ai.addGoal(2, new AbstractGoal() { - - @Override - public boolean continueExecuting() { - return rand.nextInt(100) < 40; - } - - @Override - public void start() { - npc.chat("Firing away!"); - } - - @Override - public void update() { - Location loc = npc.getBukkitEntity().getLocation(); - loc.setPitch(new Random().nextFloat() * 360); - loc.setYaw(new Random().nextFloat() * 360); - npc.getBukkitEntity().teleport(loc); - npc.getBukkitEntity().launchProjectile(Arrow.class); - } - }); - } -}