SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use Disguise instead of entity id in watcher

Browse Source
This commit is contained in:
Andrew 2013-07-21 15:14:40 +12:00
parent dcb8bc427e
commit ff8542c80a
29 changed files with 108 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/AgeableWatcher.java
View File

@ -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) {
super(entityId);
public AgeableWatcher(Disguise disguise) {
super(disguise);
}
public boolean isAdult() {

5
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/ArrowWatcher.java
View File

@ -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) {
super(entityId);
public ArrowWatcher(Disguise disguise) {
super(disguise);
setValue(16, (byte) 0);
}

6
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/BatWatcher.java
View File

@ -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) {
super(entityId);
public BatWatcher(Disguise disguise) {
super(disguise);
}
public boolean isFlying() {

6
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/BlazeWatcher.java
View File

@ -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) {
super(entityId);
public BlazeWatcher(Disguise disguise) {
super(disguise);
}
public boolean isBlazing() {

5
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/BoatWatcher.java
View File

@ -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) {
super(entityId);
public BoatWatcher(Disguise disguise) {
super(disguise);
}
public int getDamage() {

6
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/ChickenWatcher.java
View File

@ -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) {
super(entityId);
public ChickenWatcher(Disguise disguise) {
super(disguise);
}
}

6
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/CowWatcher.java
View File

@ -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) {
super(entityId);
public CowWatcher(Disguise disguise) {
super(disguise);
}
}

6
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/CreeperWatcher.java
View File

@ -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) {
super(entityId);
public CreeperWatcher(Disguise disguise) {
super(disguise);
}
public boolean isFused() {

5
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/DroppedItemWatcher.java
View File

@ -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) {
super(entityId);
public DroppedItemWatcher(Disguise disguise) {
super(disguise);
}
public ItemStack getItemStack() {

6
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/EnderDragonWatcher.java
View File

@ -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) {
super(entityId);
public EnderDragonWatcher(Disguise disguise) {
super(disguise);
}
}

6
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/EndermanWatcher.java
View File

@ -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) {
super(entityId);
public EndermanWatcher(Disguise disguise) {
super(disguise);
}
public int getCarriedData() {

6
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/GhastWatcher.java
View File

@ -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) {
super(entityId);
public GhastWatcher(Disguise disguise) {
super(disguise);
}
public boolean isAgressive() {

6
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/HorseWatcher.java
View File

@ -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) {
super(entityId);
public HorseWatcher(Disguise disguise) {
super(disguise);
setValue(20, new Random().nextInt(7));
}

5
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/ItemFrameWatcher.java
View File

@ -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) {
super(entityId);
public ItemFrameWatcher(Disguise disguise) {
super(disguise);
}
public ItemStack getItemStack() {

6
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/LivingWatcher.java
View File

@ -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) {
super(entityId);
public LivingWatcher(Disguise disguise) {
super(disguise);
}
public void addPotionEffect(PotionEffect potionEffect) {

6
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/MagmaCubeWatcher.java
View File

@ -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) {
super(entityId);
public MagmaCubeWatcher(Disguise disguise) {
super(disguise);
}
}

5
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/MinecartWatcher.java
View File

@ -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) {
super(entityId);
public MinecartWatcher(Disguise disguise) {
super(disguise);
}
public float getDamage() {

6
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/MushroomCowWatcher.java
View File

@ -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) {
super(entityId);
public MushroomCowWatcher(Disguise disguise) {
super(disguise);
}
}

6
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/OcelotWatcher.java
View File

@ -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) {
super(entityId);
public OcelotWatcher(Disguise disguise) {
super(disguise);
}
public String getOwner() {

6
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/PigWatcher.java
View File

@ -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) {
super(entityId);
public PigWatcher(Disguise disguise) {
super(disguise);
}
public boolean isSaddled() {

6
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/PigZombieWatcher.java
View File

@ -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) {
super(entityId);
public PigZombieWatcher(Disguise disguise) {
super(disguise);
}
}

6
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/PlayerWatcher.java
View File

@ -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) {
super(entityId);
public PlayerWatcher(Disguise disguise) {
super(disguise);
}
public int getArrowsSticking() {

5
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/SheepWatcher.java
View File

@ -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) {
super(entityId);
public SheepWatcher(Disguise disguise) {
super(disguise);
setValue(16, (byte) 0);
}

6
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/SkeletonWatcher.java
View File

@ -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) {
super(entityId);
public SkeletonWatcher(Disguise disguise) {
super(disguise);
}
}

6
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/SlimeWatcher.java
View File

@ -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) {
super(entityId);
public SlimeWatcher(Disguise disguise) {
super(disguise);
setValue(16, (byte) (new Random().nextInt(4) + 1));
}

6
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/VillagerWatcher.java
View File

@ -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) {
super(entityId);
public VillagerWatcher(Disguise disguise) {
super(disguise);
setValue(16, Profession.values()[new Random().nextInt(Profession.values().length)].getId());
}

6
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/WitherWatcher.java
View File

@ -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) {
super(entityId);
public WitherWatcher(Disguise disguise) {
super(disguise);
}
}

5
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/WolfWatcher.java
View File

@ -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) {
super(entityId);
public WolfWatcher(Disguise disguise) {
super(disguise);
}
public AnimalColor getCollarColor() {

6
src/me/libraryaddict/disguise/DisguiseTypes/Watchers/ZombieWatcher.java
View File

@ -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) {
super(entityId);
public ZombieWatcher(Disguise disguise) {
super(disguise);
}
public boolean isAdult() {