Rename horse watchers to ChestedHorseWatcher and AbstractHorseWatcher
This commit is contained in:
parent
32162f6d44
commit
c2f063b1dc
@ -27,7 +27,7 @@ import me.libraryaddict.disguise.disguisetypes.MobDisguise;
|
|||||||
import me.libraryaddict.disguise.disguisetypes.PlayerDisguise;
|
import me.libraryaddict.disguise.disguisetypes.PlayerDisguise;
|
||||||
import me.libraryaddict.disguise.disguisetypes.TargetedDisguise;
|
import me.libraryaddict.disguise.disguisetypes.TargetedDisguise;
|
||||||
import me.libraryaddict.disguise.disguisetypes.TargetedDisguise.TargetType;
|
import me.libraryaddict.disguise.disguisetypes.TargetedDisguise.TargetType;
|
||||||
import me.libraryaddict.disguise.disguisetypes.watchers.HorseAbstractWatcher;
|
import me.libraryaddict.disguise.disguisetypes.watchers.AbstractHorseWatcher;
|
||||||
import me.libraryaddict.disguise.disguisetypes.watchers.HorseWatcher;
|
import me.libraryaddict.disguise.disguisetypes.watchers.HorseWatcher;
|
||||||
import me.libraryaddict.disguise.disguisetypes.watchers.LivingWatcher;
|
import me.libraryaddict.disguise.disguisetypes.watchers.LivingWatcher;
|
||||||
import me.libraryaddict.disguise.utilities.DisguiseUtilities;
|
import me.libraryaddict.disguise.utilities.DisguiseUtilities;
|
||||||
@ -83,7 +83,7 @@ public class DisguiseAPI {
|
|||||||
ItemStack saddle = horseInventory.getSaddle();
|
ItemStack saddle = horseInventory.getSaddle();
|
||||||
|
|
||||||
if (saddle != null && saddle.getType() == Material.SADDLE) {
|
if (saddle != null && saddle.getType() == Material.SADDLE) {
|
||||||
((HorseAbstractWatcher) watcher).setSaddled(true);
|
((AbstractHorseWatcher) watcher).setSaddled(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (watcher instanceof HorseWatcher)
|
if (watcher instanceof HorseWatcher)
|
||||||
|
@ -34,8 +34,8 @@ import me.libraryaddict.disguise.disguisetypes.watchers.FireworkWatcher;
|
|||||||
import me.libraryaddict.disguise.disguisetypes.watchers.FishingHookWatcher;
|
import me.libraryaddict.disguise.disguisetypes.watchers.FishingHookWatcher;
|
||||||
import me.libraryaddict.disguise.disguisetypes.watchers.GhastWatcher;
|
import me.libraryaddict.disguise.disguisetypes.watchers.GhastWatcher;
|
||||||
import me.libraryaddict.disguise.disguisetypes.watchers.GuardianWatcher;
|
import me.libraryaddict.disguise.disguisetypes.watchers.GuardianWatcher;
|
||||||
import me.libraryaddict.disguise.disguisetypes.watchers.HorseAbstractWatcher;
|
import me.libraryaddict.disguise.disguisetypes.watchers.AbstractHorseWatcher;
|
||||||
import me.libraryaddict.disguise.disguisetypes.watchers.HorseChestedWatcher;
|
import me.libraryaddict.disguise.disguisetypes.watchers.ChestedHorseWatcher;
|
||||||
import me.libraryaddict.disguise.disguisetypes.watchers.HorseWatcher;
|
import me.libraryaddict.disguise.disguisetypes.watchers.HorseWatcher;
|
||||||
import me.libraryaddict.disguise.disguisetypes.watchers.InsentientWatcher;
|
import me.libraryaddict.disguise.disguisetypes.watchers.InsentientWatcher;
|
||||||
import me.libraryaddict.disguise.disguisetypes.watchers.IronGolemWatcher;
|
import me.libraryaddict.disguise.disguisetypes.watchers.IronGolemWatcher;
|
||||||
@ -172,13 +172,13 @@ public class FlagType<Y> {
|
|||||||
|
|
||||||
public static FlagType<Integer> HORSE_ARMOR = new FlagType<Integer>(HorseWatcher.class, 1, 0);
|
public static FlagType<Integer> HORSE_ARMOR = new FlagType<Integer>(HorseWatcher.class, 1, 0);
|
||||||
|
|
||||||
public static FlagType<Boolean> HORSE_CHESTED_CARRYING_CHEST = new FlagType<Boolean>(HorseChestedWatcher.class, 0, false);
|
public static FlagType<Boolean> HORSE_CHESTED_CARRYING_CHEST = new FlagType<Boolean>(ChestedHorseWatcher.class, 0, false);
|
||||||
|
|
||||||
public static FlagType<Integer> HORSE_COLOR = new FlagType<Integer>(HorseWatcher.class, 0, 0);
|
public static FlagType<Integer> HORSE_COLOR = new FlagType<Integer>(HorseWatcher.class, 0, 0);
|
||||||
|
|
||||||
public static FlagType<Byte> HORSE_META = new FlagType<Byte>(HorseAbstractWatcher.class, 0, (byte) 0);
|
public static FlagType<Byte> HORSE_META = new FlagType<Byte>(AbstractHorseWatcher.class, 0, (byte) 0);
|
||||||
|
|
||||||
public static FlagType<Optional<UUID>> HORSE_OWNER = new FlagType<Optional<UUID>>(HorseAbstractWatcher.class, 1,
|
public static FlagType<Optional<UUID>> HORSE_OWNER = new FlagType<Optional<UUID>>(AbstractHorseWatcher.class, 1,
|
||||||
Optional.<UUID> absent());
|
Optional.<UUID> absent());
|
||||||
|
|
||||||
// public static FlagType<Integer> HORSE_VARIANT = new FlagType<Integer>(HorseWatcher.class, 0, 0);
|
// public static FlagType<Integer> HORSE_VARIANT = new FlagType<Integer>(HorseWatcher.class, 0, 0);
|
||||||
|
@ -7,8 +7,8 @@ import com.google.common.base.Optional;
|
|||||||
import me.libraryaddict.disguise.disguisetypes.Disguise;
|
import me.libraryaddict.disguise.disguisetypes.Disguise;
|
||||||
import me.libraryaddict.disguise.disguisetypes.FlagType;
|
import me.libraryaddict.disguise.disguisetypes.FlagType;
|
||||||
|
|
||||||
public class HorseAbstractWatcher extends AgeableWatcher {
|
public class AbstractHorseWatcher extends AgeableWatcher {
|
||||||
public HorseAbstractWatcher(Disguise disguise) {
|
public AbstractHorseWatcher(Disguise disguise) {
|
||||||
super(disguise);
|
super(disguise);
|
||||||
}
|
}
|
||||||
|
|
@ -3,9 +3,9 @@ package me.libraryaddict.disguise.disguisetypes.watchers;
|
|||||||
import me.libraryaddict.disguise.disguisetypes.Disguise;
|
import me.libraryaddict.disguise.disguisetypes.Disguise;
|
||||||
import me.libraryaddict.disguise.disguisetypes.FlagType;
|
import me.libraryaddict.disguise.disguisetypes.FlagType;
|
||||||
|
|
||||||
public class HorseChestedWatcher extends HorseAbstractWatcher {
|
public class ChestedHorseWatcher extends AbstractHorseWatcher {
|
||||||
|
|
||||||
public HorseChestedWatcher(Disguise disguise) {
|
public ChestedHorseWatcher(Disguise disguise) {
|
||||||
super(disguise);
|
super(disguise);
|
||||||
}
|
}
|
||||||
|
|
@ -2,7 +2,7 @@ package me.libraryaddict.disguise.disguisetypes.watchers;
|
|||||||
|
|
||||||
import me.libraryaddict.disguise.disguisetypes.Disguise;
|
import me.libraryaddict.disguise.disguisetypes.Disguise;
|
||||||
|
|
||||||
public class DonkeyWatcher extends HorseChestedWatcher {
|
public class DonkeyWatcher extends ChestedHorseWatcher {
|
||||||
|
|
||||||
public DonkeyWatcher(Disguise disguise) {
|
public DonkeyWatcher(Disguise disguise) {
|
||||||
super(disguise);
|
super(disguise);
|
||||||
|
@ -9,7 +9,7 @@ import me.libraryaddict.disguise.disguisetypes.Disguise;
|
|||||||
import me.libraryaddict.disguise.disguisetypes.FlagType;
|
import me.libraryaddict.disguise.disguisetypes.FlagType;
|
||||||
import me.libraryaddict.disguise.utilities.DisguiseUtilities;
|
import me.libraryaddict.disguise.utilities.DisguiseUtilities;
|
||||||
|
|
||||||
public class HorseWatcher extends HorseAbstractWatcher {
|
public class HorseWatcher extends AbstractHorseWatcher {
|
||||||
public HorseWatcher(Disguise disguise) {
|
public HorseWatcher(Disguise disguise) {
|
||||||
super(disguise);
|
super(disguise);
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@ import me.libraryaddict.disguise.disguisetypes.AnimalColor;
|
|||||||
import me.libraryaddict.disguise.disguisetypes.Disguise;
|
import me.libraryaddict.disguise.disguisetypes.Disguise;
|
||||||
import me.libraryaddict.disguise.disguisetypes.FlagType;
|
import me.libraryaddict.disguise.disguisetypes.FlagType;
|
||||||
|
|
||||||
public class LlamaWatcher extends HorseChestedWatcher {
|
public class LlamaWatcher extends ChestedHorseWatcher {
|
||||||
|
|
||||||
public LlamaWatcher(Disguise disguise) {
|
public LlamaWatcher(Disguise disguise) {
|
||||||
super(disguise);
|
super(disguise);
|
||||||
|
@ -2,7 +2,7 @@ package me.libraryaddict.disguise.disguisetypes.watchers;
|
|||||||
|
|
||||||
import me.libraryaddict.disguise.disguisetypes.Disguise;
|
import me.libraryaddict.disguise.disguisetypes.Disguise;
|
||||||
|
|
||||||
public class MuleWatcher extends HorseChestedWatcher {
|
public class MuleWatcher extends ChestedHorseWatcher {
|
||||||
|
|
||||||
public MuleWatcher(Disguise disguise) {
|
public MuleWatcher(Disguise disguise) {
|
||||||
super(disguise);
|
super(disguise);
|
||||||
|
@ -2,7 +2,7 @@ package me.libraryaddict.disguise.disguisetypes.watchers;
|
|||||||
|
|
||||||
import me.libraryaddict.disguise.disguisetypes.Disguise;
|
import me.libraryaddict.disguise.disguisetypes.Disguise;
|
||||||
|
|
||||||
public class SkeletonHorseWatcher extends HorseAbstractWatcher {
|
public class SkeletonHorseWatcher extends AbstractHorseWatcher {
|
||||||
|
|
||||||
public SkeletonHorseWatcher(Disguise disguise) {
|
public SkeletonHorseWatcher(Disguise disguise) {
|
||||||
super(disguise);
|
super(disguise);
|
||||||
|
@ -2,7 +2,7 @@ package me.libraryaddict.disguise.disguisetypes.watchers;
|
|||||||
|
|
||||||
import me.libraryaddict.disguise.disguisetypes.Disguise;
|
import me.libraryaddict.disguise.disguisetypes.Disguise;
|
||||||
|
|
||||||
public class ZombieHorseWatcher extends HorseAbstractWatcher {
|
public class ZombieHorseWatcher extends AbstractHorseWatcher {
|
||||||
|
|
||||||
public ZombieHorseWatcher(Disguise disguise) {
|
public ZombieHorseWatcher(Disguise disguise) {
|
||||||
super(disguise);
|
super(disguise);
|
||||||
|
Loading…
Reference in New Issue
Block a user