Use Disguise instead of entity id in watcher

src/me/libraryaddict/disguise/DisguiseTypes/Watchers/AgeableWatcher.java

@@ -1,9 +1,11 @@
 package me.libraryaddict.disguise.DisguiseTypes.Watchers;
 
+import me.libraryaddict.disguise.DisguiseTypes.Disguise;
+
 public abstract class AgeableWatcher extends LivingWatcher {
 
-    public AgeableWatcher(int entityId) {
+    public AgeableWatcher(Disguise disguise) {
-        super(entityId);
+        super(disguise);
     }
 
     public boolean isAdult() {

src/me/libraryaddict/disguise/DisguiseTypes/Watchers/ArrowWatcher.java

@@ -1,11 +1,12 @@
 package me.libraryaddict.disguise.DisguiseTypes.Watchers;
 
+import me.libraryaddict.disguise.DisguiseTypes.Disguise;
 import me.libraryaddict.disguise.DisguiseTypes.FlagWatcher;
 
 public class ArrowWatcher extends FlagWatcher {
 
-    public ArrowWatcher(int entityId) {
+    public ArrowWatcher(Disguise disguise) {
-        super(entityId);
+        super(disguise);
         setValue(16, (byte) 0);
     }
 

src/me/libraryaddict/disguise/DisguiseTypes/Watchers/BatWatcher.java

@@ -1,9 +1,11 @@
 package me.libraryaddict.disguise.DisguiseTypes.Watchers;
 
+import me.libraryaddict.disguise.DisguiseTypes.Disguise;
+
 public class BatWatcher extends LivingWatcher {
 
-    public BatWatcher(int entityId) {
+    public BatWatcher(Disguise disguise) {
-        super(entityId);
+        super(disguise);
     }
 
     public boolean isFlying() {

src/me/libraryaddict/disguise/DisguiseTypes/Watchers/BlazeWatcher.java

@@ -1,9 +1,11 @@
 package me.libraryaddict.disguise.DisguiseTypes.Watchers;
 
+import me.libraryaddict.disguise.DisguiseTypes.Disguise;
+
 public class BlazeWatcher extends LivingWatcher {
 
-    public BlazeWatcher(int entityId) {
+    public BlazeWatcher(Disguise disguise) {
-        super(entityId);
+        super(disguise);
     }
 
     public boolean isBlazing() {

src/me/libraryaddict/disguise/DisguiseTypes/Watchers/BoatWatcher.java

@@ -1,11 +1,12 @@
 package me.libraryaddict.disguise.DisguiseTypes.Watchers;
 
+import me.libraryaddict.disguise.DisguiseTypes.Disguise;
 import me.libraryaddict.disguise.DisguiseTypes.FlagWatcher;
 
 public class BoatWatcher extends FlagWatcher {
 
-    public BoatWatcher(int entityId) {
+    public BoatWatcher(Disguise disguise) {
-        super(entityId);
+        super(disguise);
     }
 
     public int getDamage() {

src/me/libraryaddict/disguise/DisguiseTypes/Watchers/ChickenWatcher.java

@@ -1,9 +1,11 @@
 package me.libraryaddict.disguise.DisguiseTypes.Watchers;
 
+import me.libraryaddict.disguise.DisguiseTypes.Disguise;
+
 public class ChickenWatcher extends AgeableWatcher {
 
-    public ChickenWatcher(int entityId) {
+    public ChickenWatcher(Disguise disguise) {
-        super(entityId);
+        super(disguise);
     }
 
 }

src/me/libraryaddict/disguise/DisguiseTypes/Watchers/CowWatcher.java

@@ -1,9 +1,11 @@
 package me.libraryaddict.disguise.DisguiseTypes.Watchers;
 
+import me.libraryaddict.disguise.DisguiseTypes.Disguise;
+
 public class CowWatcher extends AgeableWatcher {
 
-    public CowWatcher(int entityId) {
+    public CowWatcher(Disguise disguise) {
-        super(entityId);
+        super(disguise);
     }
 
 }

src/me/libraryaddict/disguise/DisguiseTypes/Watchers/CreeperWatcher.java

@@ -1,9 +1,11 @@
 package me.libraryaddict.disguise.DisguiseTypes.Watchers;
 
+import me.libraryaddict.disguise.DisguiseTypes.Disguise;
+
 public class CreeperWatcher extends LivingWatcher {
 
-    public CreeperWatcher(int entityId) {
+    public CreeperWatcher(Disguise disguise) {
-        super(entityId);
+        super(disguise);
     }
 
     public boolean isFused() {

src/me/libraryaddict/disguise/DisguiseTypes/Watchers/DroppedItemWatcher.java

@@ -3,12 +3,13 @@ package me.libraryaddict.disguise.DisguiseTypes.Watchers;
 import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftItemStack;
 import org.bukkit.inventory.ItemStack;
 
+import me.libraryaddict.disguise.DisguiseTypes.Disguise;
 import me.libraryaddict.disguise.DisguiseTypes.FlagWatcher;
 
 public class DroppedItemWatcher extends FlagWatcher {
 
-    public DroppedItemWatcher(int entityId) {
+    public DroppedItemWatcher(Disguise disguise) {
-        super(entityId);
+        super(disguise);
     }
 
     public ItemStack getItemStack() {

src/me/libraryaddict/disguise/DisguiseTypes/Watchers/EnderDragonWatcher.java

@@ -1,9 +1,11 @@
 package me.libraryaddict.disguise.DisguiseTypes.Watchers;
 
+import me.libraryaddict.disguise.DisguiseTypes.Disguise;
+
 public class EnderDragonWatcher extends LivingWatcher {
 
-    public EnderDragonWatcher(int entityId) {
+    public EnderDragonWatcher(Disguise disguise) {
-        super(entityId);
+        super(disguise);
     }
 
 }

src/me/libraryaddict/disguise/DisguiseTypes/Watchers/EndermanWatcher.java

@@ -1,9 +1,11 @@
 package me.libraryaddict.disguise.DisguiseTypes.Watchers;
 
+import me.libraryaddict.disguise.DisguiseTypes.Disguise;
+
 public class EndermanWatcher extends LivingWatcher {
 
-    public EndermanWatcher(int entityId) {
+    public EndermanWatcher(Disguise disguise) {
-        super(entityId);
+        super(disguise);
     }
 
     public int getCarriedData() {

src/me/libraryaddict/disguise/DisguiseTypes/Watchers/GhastWatcher.java

@@ -1,9 +1,11 @@
 package me.libraryaddict.disguise.DisguiseTypes.Watchers;
 
+import me.libraryaddict.disguise.DisguiseTypes.Disguise;
+
 public class GhastWatcher extends LivingWatcher {
 
-    public GhastWatcher(int entityId) {
+    public GhastWatcher(Disguise disguise) {
-        super(entityId);
+        super(disguise);
     }
 
     public boolean isAgressive() {

src/me/libraryaddict/disguise/DisguiseTypes/Watchers/HorseWatcher.java

@@ -2,13 +2,15 @@ package me.libraryaddict.disguise.DisguiseTypes.Watchers;
 
 import java.util.Random;
 
+import me.libraryaddict.disguise.DisguiseTypes.Disguise;
+
 import org.bukkit.entity.Horse.Color;
 import org.bukkit.entity.Horse.Style;
 
 public class HorseWatcher extends AgeableWatcher {
 
-    public HorseWatcher(int entityId) {
+    public HorseWatcher(Disguise disguise) {
-        super(entityId);
+        super(disguise);
         setValue(20, new Random().nextInt(7));
     }
 

src/me/libraryaddict/disguise/DisguiseTypes/Watchers/ItemFrameWatcher.java

@@ -3,12 +3,13 @@ package me.libraryaddict.disguise.DisguiseTypes.Watchers;
 import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftItemStack;
 import org.bukkit.inventory.ItemStack;
 
+import me.libraryaddict.disguise.DisguiseTypes.Disguise;
 import me.libraryaddict.disguise.DisguiseTypes.FlagWatcher;
 
 public class ItemFrameWatcher extends FlagWatcher {
 
-    public ItemFrameWatcher(int entityId) {
+    public ItemFrameWatcher(Disguise disguise) {
-        super(entityId);
+        super(disguise);
     }
 
     public ItemStack getItemStack() {

src/me/libraryaddict/disguise/DisguiseTypes/Watchers/LivingWatcher.java

@@ -8,14 +8,14 @@ import net.minecraft.server.v1_6_R2.PotionBrewer;
 
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
-
+import me.libraryaddict.disguise.DisguiseTypes.Disguise;
 import me.libraryaddict.disguise.DisguiseTypes.FlagWatcher;
 
 public class LivingWatcher extends FlagWatcher {
     private HashSet<MobEffect> potionEffects = new HashSet<MobEffect>();
 
-    public LivingWatcher(int entityId) {
+    public LivingWatcher(Disguise disguise) {
-        super(entityId);
+        super(disguise);
     }
 
     public void addPotionEffect(PotionEffect potionEffect) {

src/me/libraryaddict/disguise/DisguiseTypes/Watchers/MagmaCubeWatcher.java

@@ -1,8 +1,10 @@
 package me.libraryaddict.disguise.DisguiseTypes.Watchers;
 
+import me.libraryaddict.disguise.DisguiseTypes.Disguise;
+
 public class MagmaCubeWatcher extends SlimeWatcher {
 
-    public MagmaCubeWatcher(int entityId) {
+    public MagmaCubeWatcher(Disguise disguise) {
-        super(entityId);
+        super(disguise);
     }
 }

src/me/libraryaddict/disguise/DisguiseTypes/Watchers/MinecartWatcher.java

@@ -1,11 +1,12 @@
 package me.libraryaddict.disguise.DisguiseTypes.Watchers;
 
+import me.libraryaddict.disguise.DisguiseTypes.Disguise;
 import me.libraryaddict.disguise.DisguiseTypes.FlagWatcher;
 
 public class MinecartWatcher extends FlagWatcher {
 
-    public MinecartWatcher(int entityId) {
+    public MinecartWatcher(Disguise disguise) {
-        super(entityId);
+        super(disguise);
     }
 
     public float getDamage() {

src/me/libraryaddict/disguise/DisguiseTypes/Watchers/MushroomCowWatcher.java

@@ -1,9 +1,11 @@
 package me.libraryaddict.disguise.DisguiseTypes.Watchers;
 
+import me.libraryaddict.disguise.DisguiseTypes.Disguise;
+
 public class MushroomCowWatcher extends AgeableWatcher {
 
-    public MushroomCowWatcher(int entityId) {
+    public MushroomCowWatcher(Disguise disguise) {
-        super(entityId);
+        super(disguise);
     }
 
 }

src/me/libraryaddict/disguise/DisguiseTypes/Watchers/OcelotWatcher.java

@@ -1,12 +1,14 @@
 package me.libraryaddict.disguise.DisguiseTypes.Watchers;
 
+import me.libraryaddict.disguise.DisguiseTypes.Disguise;
+
 import org.bukkit.entity.Ocelot;
 import org.bukkit.entity.Ocelot.Type;
 
 public class OcelotWatcher extends AgeableWatcher {
 
-    public OcelotWatcher(int entityId) {
+    public OcelotWatcher(Disguise disguise) {
-        super(entityId);
+        super(disguise);
     }
 
     public String getOwner() {

src/me/libraryaddict/disguise/DisguiseTypes/Watchers/PigWatcher.java

@@ -1,9 +1,11 @@
 package me.libraryaddict.disguise.DisguiseTypes.Watchers;
 
+import me.libraryaddict.disguise.DisguiseTypes.Disguise;
+
 public class PigWatcher extends AgeableWatcher {
 
-    public PigWatcher(int entityId) {
+    public PigWatcher(Disguise disguise) {
-        super(entityId);
+        super(disguise);
     }
 
     public boolean isSaddled() {

src/me/libraryaddict/disguise/DisguiseTypes/Watchers/PigZombieWatcher.java

@@ -1,9 +1,11 @@
 package me.libraryaddict.disguise.DisguiseTypes.Watchers;
 
+import me.libraryaddict.disguise.DisguiseTypes.Disguise;
+
 public class PigZombieWatcher extends ZombieWatcher {
 
-    public PigZombieWatcher(int entityId) {
+    public PigZombieWatcher(Disguise disguise) {
-        super(entityId);
+        super(disguise);
     }
 
 }

src/me/libraryaddict/disguise/DisguiseTypes/Watchers/PlayerWatcher.java

@@ -1,9 +1,11 @@
 package me.libraryaddict.disguise.DisguiseTypes.Watchers;
 
+import me.libraryaddict.disguise.DisguiseTypes.Disguise;
+
 public class PlayerWatcher extends LivingWatcher {
 
-    public PlayerWatcher(int entityId) {
+    public PlayerWatcher(Disguise disguise) {
-        super(entityId);
+        super(disguise);
     }
 
     public int getArrowsSticking() {

src/me/libraryaddict/disguise/DisguiseTypes/Watchers/SheepWatcher.java

@@ -1,11 +1,12 @@
 package me.libraryaddict.disguise.DisguiseTypes.Watchers;
 
 import me.libraryaddict.disguise.DisguiseTypes.AnimalColor;
+import me.libraryaddict.disguise.DisguiseTypes.Disguise;
 
 public class SheepWatcher extends AgeableWatcher {
 
-    public SheepWatcher(int entityId) {
+    public SheepWatcher(Disguise disguise) {
-        super(entityId);
+        super(disguise);
         setValue(16, (byte) 0);
     }
 

src/me/libraryaddict/disguise/DisguiseTypes/Watchers/SkeletonWatcher.java

@@ -1,9 +1,11 @@
 package me.libraryaddict.disguise.DisguiseTypes.Watchers;
 
+import me.libraryaddict.disguise.DisguiseTypes.Disguise;
+
 public class SkeletonWatcher extends LivingWatcher {
 
-    public SkeletonWatcher(int entityId) {
+    public SkeletonWatcher(Disguise disguise) {
-        super(entityId);
+        super(disguise);
     }
 
 }

src/me/libraryaddict/disguise/DisguiseTypes/Watchers/SlimeWatcher.java

@@ -2,10 +2,12 @@ package me.libraryaddict.disguise.DisguiseTypes.Watchers;
 
 import java.util.Random;
 
+import me.libraryaddict.disguise.DisguiseTypes.Disguise;
+
 public class SlimeWatcher extends LivingWatcher {
 
-    public SlimeWatcher(int entityId) {
+    public SlimeWatcher(Disguise disguise) {
-        super(entityId);
+        super(disguise);
         setValue(16, (byte) (new Random().nextInt(4) + 1));
     }
 

src/me/libraryaddict/disguise/DisguiseTypes/Watchers/VillagerWatcher.java

@@ -2,12 +2,14 @@ package me.libraryaddict.disguise.DisguiseTypes.Watchers;
 
 import java.util.Random;
 
+import me.libraryaddict.disguise.DisguiseTypes.Disguise;
+
 import org.bukkit.entity.Villager.Profession;
 
 public class VillagerWatcher extends AgeableWatcher {
 
-    public VillagerWatcher(int entityId) {
+    public VillagerWatcher(Disguise disguise) {
-        super(entityId);
+        super(disguise);
         setValue(16, Profession.values()[new Random().nextInt(Profession.values().length)].getId());
     }
 

src/me/libraryaddict/disguise/DisguiseTypes/Watchers/WitherWatcher.java

@@ -1,8 +1,10 @@
 package me.libraryaddict.disguise.DisguiseTypes.Watchers;
 
+import me.libraryaddict.disguise.DisguiseTypes.Disguise;
+
 public class WitherWatcher extends EnderDragonWatcher {
 
-    public WitherWatcher(int entityId) {
+    public WitherWatcher(Disguise disguise) {
-        super(entityId);
+        super(disguise);
     }
 }

src/me/libraryaddict/disguise/DisguiseTypes/Watchers/WolfWatcher.java

@@ -1,11 +1,12 @@
 package me.libraryaddict.disguise.DisguiseTypes.Watchers;
 
 import me.libraryaddict.disguise.DisguiseTypes.AnimalColor;
+import me.libraryaddict.disguise.DisguiseTypes.Disguise;
 
 public class WolfWatcher extends AgeableWatcher {
 
-    public WolfWatcher(int entityId) {
+    public WolfWatcher(Disguise disguise) {
-        super(entityId);
+        super(disguise);
     }
 
     public AnimalColor getCollarColor() {

src/me/libraryaddict/disguise/DisguiseTypes/Watchers/ZombieWatcher.java

@@ -1,9 +1,11 @@
 package me.libraryaddict.disguise.DisguiseTypes.Watchers;
 
+import me.libraryaddict.disguise.DisguiseTypes.Disguise;
+
 public class ZombieWatcher extends LivingWatcher {
 
-    public ZombieWatcher(int entityId) {
+    public ZombieWatcher(Disguise disguise) {
-        super(entityId);
+        super(disguise);
     }
 
     public boolean isAdult() {