Minor code cleanup
This commit is contained in:
parent
11f0546fbe
commit
cb5aec155a
@ -17,13 +17,13 @@ public enum DisguiseType {
|
||||
|
||||
BAT,
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_15) BEE,
|
||||
@NmsAddedIn(NmsVersion.v1_15) BEE,
|
||||
|
||||
BLAZE,
|
||||
|
||||
BOAT(1),
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14) CAT,
|
||||
@NmsAddedIn(NmsVersion.v1_14) CAT,
|
||||
|
||||
CAVE_SPIDER,
|
||||
|
||||
@ -75,7 +75,7 @@ public enum DisguiseType {
|
||||
|
||||
FISHING_HOOK(90),
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14) FOX,
|
||||
@NmsAddedIn(NmsVersion.v1_14) FOX,
|
||||
|
||||
GHAST,
|
||||
|
||||
@ -83,7 +83,7 @@ public enum DisguiseType {
|
||||
|
||||
GUARDIAN,
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_16) HOGLIN,
|
||||
@NmsAddedIn(NmsVersion.v1_16) HOGLIN,
|
||||
|
||||
HORSE,
|
||||
|
||||
@ -129,7 +129,7 @@ public enum DisguiseType {
|
||||
|
||||
PAINTING,
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14) PANDA,
|
||||
@NmsAddedIn(NmsVersion.v1_14) PANDA,
|
||||
|
||||
PARROT,
|
||||
|
||||
@ -137,11 +137,11 @@ public enum DisguiseType {
|
||||
|
||||
PIG,
|
||||
|
||||
@NmsRemovedIn(val = NmsVersion.v1_16) PIG_ZOMBIE,
|
||||
@NmsRemovedIn(NmsVersion.v1_16) PIG_ZOMBIE,
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_16) PIGLIN,
|
||||
@NmsAddedIn(NmsVersion.v1_16) PIGLIN,
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14) PILLAGER,
|
||||
@NmsAddedIn(NmsVersion.v1_14) PILLAGER,
|
||||
|
||||
PLAYER,
|
||||
|
||||
@ -153,7 +153,7 @@ public enum DisguiseType {
|
||||
|
||||
RABBIT,
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14) RAVAGER,
|
||||
@NmsAddedIn(NmsVersion.v1_14) RAVAGER,
|
||||
|
||||
SALMON,
|
||||
|
||||
@ -187,15 +187,15 @@ public enum DisguiseType {
|
||||
|
||||
STRAY,
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_16) STRIDER,
|
||||
@NmsAddedIn(NmsVersion.v1_16) STRIDER,
|
||||
|
||||
THROWN_EXP_BOTTLE(75),
|
||||
|
||||
@NmsRemovedIn(val = NmsVersion.v1_14) TIPPED_ARROW(60),
|
||||
@NmsRemovedIn(NmsVersion.v1_14) TIPPED_ARROW(60),
|
||||
|
||||
TRIDENT(94, 0),
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14) TRADER_LLAMA,
|
||||
@NmsAddedIn(NmsVersion.v1_14) TRADER_LLAMA,
|
||||
|
||||
TROPICAL_FISH,
|
||||
|
||||
@ -209,7 +209,7 @@ public enum DisguiseType {
|
||||
|
||||
VINDICATOR,
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14) WANDERING_TRADER,
|
||||
@NmsAddedIn(NmsVersion.v1_14) WANDERING_TRADER,
|
||||
|
||||
WITCH,
|
||||
|
||||
@ -221,7 +221,7 @@ public enum DisguiseType {
|
||||
|
||||
WOLF,
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_16) ZOGLIN,
|
||||
@NmsAddedIn(NmsVersion.v1_16) ZOGLIN,
|
||||
|
||||
ZOMBIE,
|
||||
|
||||
@ -229,7 +229,7 @@ public enum DisguiseType {
|
||||
|
||||
ZOMBIE_VILLAGER,
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_16) ZOMBIFIED_PIGLIN;
|
||||
@NmsAddedIn(NmsVersion.v1_16) ZOMBIFIED_PIGLIN;
|
||||
|
||||
public static DisguiseType getType(Entity entity) {
|
||||
DisguiseType disguiseType = getType(entity.getType());
|
||||
|
@ -282,12 +282,12 @@ public class FlagWatcher {
|
||||
updateNameHeight();
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public EntityPose getEntityPose() {
|
||||
return getData(MetaIndex.ENTITY_POSE);
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public void setEntityPose(EntityPose entityPose) {
|
||||
setData(MetaIndex.ENTITY_POSE, entityPose);
|
||||
sendData(MetaIndex.ENTITY_POSE);
|
||||
@ -760,12 +760,12 @@ public class FlagWatcher {
|
||||
}
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public boolean isSleeping() {
|
||||
return sleeping;
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public void setSleeping(boolean sleeping) {
|
||||
if (isSleeping() == sleeping) {
|
||||
return;
|
||||
@ -776,12 +776,12 @@ public class FlagWatcher {
|
||||
updatePose();
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public boolean isSwimming() {
|
||||
return getEntityFlag(4);
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public void setSwimming(boolean swimming) {
|
||||
if (isSwimming() == swimming) {
|
||||
return;
|
||||
@ -792,7 +792,7 @@ public class FlagWatcher {
|
||||
updatePose();
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
protected void updatePose() {
|
||||
if (isSleeping()) {
|
||||
setEntityPose(EntityPose.SLEEPING);
|
||||
|
@ -45,18 +45,18 @@ public class MetaIndex<Y> {
|
||||
/**
|
||||
* The type of particle to display
|
||||
*/
|
||||
@NmsAddedIn(value = NmsVersion.v1_13)
|
||||
@NmsAddedIn(NmsVersion.v1_13)
|
||||
public static MetaIndex<WrappedParticle> AREA_EFFECT_PARTICLE = new MetaIndex<>(AreaEffectCloudWatcher.class, 3,
|
||||
NmsVersion.v1_13.isSupported() ? WrappedParticle.create(Particle.SPELL_MOB, null) : null);
|
||||
|
||||
@NmsRemovedIn(val = NmsVersion.v1_13)
|
||||
@NmsRemovedIn(NmsVersion.v1_13)
|
||||
public static MetaIndex<Integer> AREA_EFFECT_PARTICLE_OLD = new MetaIndex<>(AreaEffectCloudWatcher.class, 3, 0);
|
||||
|
||||
@NmsRemovedIn(val = NmsVersion.v1_13)
|
||||
@NmsRemovedIn(NmsVersion.v1_13)
|
||||
public static MetaIndex<Integer> AREA_EFFECT_PARTICLE_PARAM_1_OLD = new MetaIndex<>(AreaEffectCloudWatcher.class, 4,
|
||||
0);
|
||||
|
||||
@NmsRemovedIn(val = NmsVersion.v1_13)
|
||||
@NmsRemovedIn(NmsVersion.v1_13)
|
||||
public static MetaIndex<Integer> AREA_EFFECT_PARTICLE_PARAM_2_OLD = new MetaIndex<>(AreaEffectCloudWatcher.class, 5,
|
||||
0);
|
||||
|
||||
@ -114,11 +114,11 @@ public class MetaIndex<Y> {
|
||||
/**
|
||||
* The shooter of the arrow, no visible effect if set
|
||||
*/
|
||||
@NmsAddedIn(value = NmsVersion.v1_13)
|
||||
@NmsRemovedIn(val = NmsVersion.v1_16)
|
||||
@NmsAddedIn(NmsVersion.v1_13)
|
||||
@NmsRemovedIn(NmsVersion.v1_16)
|
||||
public static MetaIndex<Optional<UUID>> ARROW_UUID = new MetaIndex<>(ArrowWatcher.class, 1, Optional.empty());
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<Byte> ARROW_PIERCE_LEVEL = new MetaIndex<>(ArrowWatcher.class, 2, (byte) 0);
|
||||
|
||||
/**
|
||||
@ -126,10 +126,10 @@ public class MetaIndex<Y> {
|
||||
*/
|
||||
public static MetaIndex<Byte> BAT_HANGING = new MetaIndex<>(BatWatcher.class, 0, (byte) 1);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_15)
|
||||
@NmsAddedIn(NmsVersion.v1_15)
|
||||
public static MetaIndex<Byte> BEE_META = new MetaIndex<>(BeeWatcher.class, 0, (byte) 0);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_15)
|
||||
@NmsAddedIn(NmsVersion.v1_15)
|
||||
public static MetaIndex<Integer> BEE_ANGER = new MetaIndex<>(BeeWatcher.class, 1, 0);
|
||||
|
||||
/**
|
||||
@ -155,19 +155,19 @@ public class MetaIndex<Y> {
|
||||
*/
|
||||
public static MetaIndex<Integer> BOAT_TYPE = new MetaIndex<>(BoatWatcher.class, 3, 0);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_13)
|
||||
@NmsAddedIn(NmsVersion.v1_13)
|
||||
public static MetaIndex<Integer> BOAT_SHAKE = new MetaIndex<>(BoatWatcher.class, 6, 0);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<Integer> CAT_TYPE = new MetaIndex<>(CatWatcher.class, 0, 0);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<Boolean> CAT_LYING_DOWN = new MetaIndex<>(CatWatcher.class, 1, false);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<Boolean> CAT_LOOKING_UP = new MetaIndex<>(CatWatcher.class, 2, false);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<Integer> CAT_COLLAR = new MetaIndex<>(CatWatcher.class, 3, AnimalColor.RED.ordinal());
|
||||
|
||||
/**
|
||||
@ -216,7 +216,7 @@ public class MetaIndex<Y> {
|
||||
|
||||
public static MetaIndex<Integer> ENDER_DRAGON_PHASE = new MetaIndex<>(EnderDragonWatcher.class, 0, 10);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<ItemStack> ENDER_SIGNAL_ITEM = new MetaIndex<>(EnderSignalWatcher.class, 0,
|
||||
new ItemStack(Material.AIR));
|
||||
|
||||
@ -225,7 +225,7 @@ public class MetaIndex<Y> {
|
||||
*/
|
||||
public static MetaIndex<Boolean> ENDERMAN_AGRESSIVE = new MetaIndex<>(EndermanWatcher.class, 1, false);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_15)
|
||||
@NmsAddedIn(NmsVersion.v1_15)
|
||||
public static MetaIndex<Boolean> ENDERMAN_UNKNOWN = new MetaIndex<>(EndermanWatcher.class, 2, false);
|
||||
|
||||
/**
|
||||
@ -239,13 +239,13 @@ public class MetaIndex<Y> {
|
||||
/**
|
||||
* The custom name of the entity, empty if not set
|
||||
*/
|
||||
@NmsAddedIn(value = NmsVersion.v1_13)
|
||||
@NmsAddedIn(NmsVersion.v1_13)
|
||||
public static MetaIndex<Optional<WrappedChatComponent>> ENTITY_CUSTOM_NAME = new MetaIndex<>(FlagWatcher.class, 2,
|
||||
Optional.empty());
|
||||
/**
|
||||
* The custom name of the entity, empty if not set
|
||||
*/
|
||||
@NmsRemovedIn(val = NmsVersion.v1_13)
|
||||
@NmsRemovedIn(NmsVersion.v1_13)
|
||||
public static MetaIndex<String> ENTITY_CUSTOM_NAME_OLD = new MetaIndex<>(FlagWatcher.class, 2, "");
|
||||
|
||||
/**
|
||||
@ -272,13 +272,13 @@ public class MetaIndex<Y> {
|
||||
* If entity can make sounds, no noticable effects
|
||||
*/
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<EntityPose> ENTITY_POSE = new MetaIndex<>(FlagWatcher.class, 6, EntityPose.STANDING);
|
||||
|
||||
public static MetaIndex<BlockPosition> FALLING_BLOCK_POSITION = new MetaIndex<>(FallingBlockWatcher.class, 0,
|
||||
BlockPosition.ORIGIN);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<ItemStack> FIREBALL_ITEM = new MetaIndex<>(FireballWatcher.class, 0,
|
||||
new ItemStack(Material.AIR));
|
||||
|
||||
@ -287,34 +287,34 @@ public class MetaIndex<Y> {
|
||||
|
||||
public static MetaIndex<Boolean> FISH_FROM_BUCKET = new MetaIndex<>(FishWatcher.class, 0, false);
|
||||
|
||||
@NmsRemovedIn(val = NmsVersion.v1_14)
|
||||
@NmsRemovedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<Integer> FIREWORK_ATTACHED_ENTITY_OLD = new MetaIndex<>(FireworkWatcher.class, 1, 0);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<OptionalInt> FIREWORK_ATTACHED_ENTITY = new MetaIndex<>(FireworkWatcher.class, 1,
|
||||
OptionalInt.empty());
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<Boolean> FIREWORK_SHOT_AT_ANGLE = new MetaIndex<>(FireworkWatcher.class, 2, false);
|
||||
|
||||
public static MetaIndex<Integer> FISHING_HOOK_HOOKED_ID = new MetaIndex<>(FishingHookWatcher.class, 0, 0);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_16)
|
||||
@NmsAddedIn(NmsVersion.v1_16)
|
||||
public static MetaIndex<Boolean> FISHING_HOOK_HOOKED = new MetaIndex<>(FishingHookWatcher.class, 1, false);
|
||||
|
||||
/**
|
||||
* The type of fox, its coloring
|
||||
*/
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<Integer> FOX_TYPE = new MetaIndex<>(FoxWatcher.class, 0, 0);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<Byte> FOX_META = new MetaIndex<>(FoxWatcher.class, 1, (byte) 0);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<Optional<UUID>> FOX_TRUSTED_1 = new MetaIndex<>(FoxWatcher.class, 2, Optional.empty());
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<Optional<UUID>> FOX_TRUSTED_2 = new MetaIndex<>(FoxWatcher.class, 3, Optional.empty());
|
||||
|
||||
/**
|
||||
@ -332,7 +332,7 @@ public class MetaIndex<Y> {
|
||||
*/
|
||||
public static MetaIndex<Integer> GUARDIAN_TARGET = new MetaIndex<>(GuardianWatcher.class, 1, 0);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_16)
|
||||
@NmsAddedIn(NmsVersion.v1_16)
|
||||
public static MetaIndex<Boolean> HOGLIN_SHAKING = new MetaIndex<>(HoglinWatcher.class, 0, false);
|
||||
|
||||
/**
|
||||
@ -341,7 +341,7 @@ public class MetaIndex<Y> {
|
||||
public static MetaIndex<Boolean> HORSE_CHESTED_CARRYING_CHEST = new MetaIndex<>(ChestedHorseWatcher.class, 0,
|
||||
false);
|
||||
|
||||
@NmsRemovedIn(val = NmsVersion.v1_14)
|
||||
@NmsRemovedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<Integer> HORSE_ARMOR = new MetaIndex<>(HorseWatcher.class, 1, 0);
|
||||
/**
|
||||
* Color of the horse, uses enum not RGB
|
||||
@ -359,13 +359,13 @@ public class MetaIndex<Y> {
|
||||
public static MetaIndex<Optional<UUID>> HORSE_OWNER = new MetaIndex<>(AbstractHorseWatcher.class, 1,
|
||||
Optional.empty());
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<Byte> ILLAGER_SPELL = new MetaIndex<>(IllagerWizardWatcher.class, 0, (byte) 0);
|
||||
|
||||
@NmsRemovedIn(val = NmsVersion.v1_14)
|
||||
@NmsRemovedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<Byte> ILLAGER_META = new MetaIndex<>(IllagerWatcher.class, 0, (byte) 0);
|
||||
|
||||
@NmsRemovedIn(val = NmsVersion.v1_14)
|
||||
@NmsRemovedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<Byte> ILLAGER_SPELL_TICKS = new MetaIndex<>(IllagerWizardWatcher.class, 0, (byte) 0);
|
||||
|
||||
public static MetaIndex<Byte> INSENTIENT_META = new MetaIndex<>(InsentientWatcher.class, 0, (byte) 0);
|
||||
@ -411,10 +411,10 @@ public class MetaIndex<Y> {
|
||||
/**
|
||||
* How many bee stings does the entity have
|
||||
*/
|
||||
@NmsAddedIn(value = NmsVersion.v1_15)
|
||||
@NmsAddedIn(NmsVersion.v1_15)
|
||||
public static MetaIndex<Integer> LIVING_STINGS = new MetaIndex<>(LivingWatcher.class, 5, 0);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<Optional<BlockPosition>> LIVING_BED_POSITION = new MetaIndex<>(LivingWatcher.class, 6,
|
||||
Optional.empty());
|
||||
|
||||
@ -464,31 +464,31 @@ public class MetaIndex<Y> {
|
||||
*/
|
||||
public static MetaIndex<Boolean> MINECART_FURANCE_FUELED = new MetaIndex<>(MinecartFurnaceWatcher.class, 0, false);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<String> MUSHROOM_COW_TYPE = new MetaIndex<>(MushroomCowWatcher.class, 0, "RED");
|
||||
|
||||
@NmsRemovedIn(val = NmsVersion.v1_14)
|
||||
@NmsRemovedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<Integer> OCELOT_TYPE = new MetaIndex<>(OcelotWatcher.class, 0, 0);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<Boolean> OCELOT_TRUST = new MetaIndex<>(OcelotWatcher.class, 0, false);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<Integer> PANDA_HEAD_SHAKING = new MetaIndex<>(PandaWatcher.class, 0, 0);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<Integer> PANDA_UNKNOWN_1 = new MetaIndex<>(PandaWatcher.class, 1, 0);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<Integer> PANDA_UNKNOWN_2 = new MetaIndex<>(PandaWatcher.class, 2, 0);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<Byte> PANDA_MAIN_GENE = new MetaIndex<>(PandaWatcher.class, 3, (byte) 0);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<Byte> PANDA_HIDDEN_GENE = new MetaIndex<>(PandaWatcher.class, 4, (byte) 0);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<Byte> PANDA_META = new MetaIndex<>(PandaWatcher.class, 5, (byte) 0);
|
||||
|
||||
public static MetaIndex<Integer> PARROT_VARIANT = new MetaIndex<>(ParrotWatcher.class, 0, 0);
|
||||
@ -502,19 +502,19 @@ public class MetaIndex<Y> {
|
||||
*/
|
||||
public static MetaIndex<Integer> PIG_BOOST = new MetaIndex<>(PigWatcher.class, 1, 0);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_16)
|
||||
@NmsAddedIn(NmsVersion.v1_16)
|
||||
public static MetaIndex<Boolean> PIGLIN_BABY = new MetaIndex<>(PiglinWatcher.class, 0, false);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_16)
|
||||
@NmsAddedIn(NmsVersion.v1_16)
|
||||
public static MetaIndex<Boolean> PIGLIN_SHAKING = new MetaIndex<>(PiglinWatcher.class, 1, false);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_16)
|
||||
@NmsAddedIn(NmsVersion.v1_16)
|
||||
public static MetaIndex<Boolean> PIGLIN_CROSSBOW = new MetaIndex<>(PiglinWatcher.class, 2, false);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_16)
|
||||
@NmsAddedIn(NmsVersion.v1_16)
|
||||
public static MetaIndex<Boolean> PIGLIN_DANCING = new MetaIndex<>(PiglinWatcher.class, 3, false);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<Boolean> PILLAGER_AIMING_BOW = new MetaIndex<>(PillagerWatcher.class, 0, false);
|
||||
|
||||
public static MetaIndex<Float> PLAYER_ABSORPTION = new MetaIndex<>(PlayerWatcher.class, 0, 0F);
|
||||
@ -537,7 +537,7 @@ public class MetaIndex<Y> {
|
||||
|
||||
public static MetaIndex<Integer> RABBIT_TYPE = new MetaIndex<>(RabbitWatcher.class, 0, 0);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<Boolean> RAIDER_CASTING_SPELL = new MetaIndex<>(RaiderWatcher.class, 0, false);
|
||||
|
||||
public static MetaIndex<Byte> SHEEP_WOOL = new MetaIndex<>(SheepWatcher.class, 0, (byte) 0);
|
||||
@ -551,20 +551,20 @@ public class MetaIndex<Y> {
|
||||
|
||||
public static MetaIndex<Byte> SHULKER_PEEKING = new MetaIndex<>(ShulkerWatcher.class, 2, (byte) 0);
|
||||
|
||||
@NmsRemovedIn(val = NmsVersion.v1_14)
|
||||
@NmsRemovedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<Boolean> SKELETON_SWING_ARMS = new MetaIndex<>(SkeletonWatcher.class, 0, false);
|
||||
|
||||
public static MetaIndex<Integer> SLIME_SIZE = new MetaIndex<>(SlimeWatcher.class, 0, 1);
|
||||
|
||||
public static MetaIndex<Byte> SNOWMAN_DERP = new MetaIndex<>(SnowmanWatcher.class, 0, (byte) 16);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_16)
|
||||
@NmsAddedIn(NmsVersion.v1_16)
|
||||
public static MetaIndex<Integer> STRIDER_SADDLE_UNKNOWN = new MetaIndex<>(StriderWatcher.class, 0, 0);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_16)
|
||||
@NmsAddedIn(NmsVersion.v1_16)
|
||||
public static MetaIndex<Boolean> STRIDER_WARM = new MetaIndex<>(StriderWatcher.class, 1, false);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_16)
|
||||
@NmsAddedIn(NmsVersion.v1_16)
|
||||
public static MetaIndex<Boolean> STRIDER_SADDLED = new MetaIndex<>(StriderWatcher.class, 2, false);
|
||||
|
||||
public static MetaIndex<Byte> SPIDER_CLIMB = new MetaIndex<>(SpiderWatcher.class, 0, (byte) 0);
|
||||
@ -577,7 +577,7 @@ public class MetaIndex<Y> {
|
||||
public static MetaIndex<Optional<UUID>> TAMEABLE_OWNER = new MetaIndex<>(TameableWatcher.class, 1,
|
||||
Optional.empty());
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<ItemStack> THROWABLE_ITEM = new MetaIndex<>(ThrowableWatcher.class, 0,
|
||||
new ItemStack(Material.AIR));
|
||||
|
||||
@ -587,7 +587,7 @@ public class MetaIndex<Y> {
|
||||
|
||||
public static MetaIndex<Byte> TRIDENT_ENCHANTS = new MetaIndex<>(TridentWatcher.class, 0, (byte) 0);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_15)
|
||||
@NmsAddedIn(NmsVersion.v1_15)
|
||||
public static MetaIndex<Boolean> TRIDENT_ENCHANTED = new MetaIndex<>(TridentWatcher.class, 1, false);
|
||||
|
||||
public static MetaIndex<Integer> TROPICAL_FISH_VARIANT = new MetaIndex<>(TropicalFishWatcher.class, 0, 0);
|
||||
@ -608,13 +608,13 @@ public class MetaIndex<Y> {
|
||||
|
||||
public static MetaIndex<Byte> VEX_ANGRY = new MetaIndex<>(VexWatcher.class, 0, (byte) 0);
|
||||
|
||||
@NmsRemovedIn(val = NmsVersion.v1_14)
|
||||
@NmsRemovedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<Integer> VILLAGER_PROFESSION = new MetaIndex<>(VillagerWatcher.class, 0, 0);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<Integer> ABSTRACT_VILLAGER_ANGRY = new MetaIndex<>(AbstractVillagerWatcher.class, 0, 0);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<VillagerData> VILLAGER_DATA = new MetaIndex<>(VillagerWatcher.class, 0,
|
||||
NmsVersion.v1_14.isSupported() ? new VillagerData(Villager.Type.PLAINS, Villager.Profession.NONE, 1) :
|
||||
null);
|
||||
@ -633,32 +633,32 @@ public class MetaIndex<Y> {
|
||||
|
||||
public static MetaIndex<Boolean> WOLF_BEGGING = new MetaIndex<>(WolfWatcher.class, 1, false);
|
||||
|
||||
@NmsRemovedIn(val = NmsVersion.v1_15)
|
||||
@NmsRemovedIn(NmsVersion.v1_15)
|
||||
public static MetaIndex<Float> WOLF_DAMAGE = new MetaIndex<>(WolfWatcher.class, 0, 1F);
|
||||
|
||||
public static MetaIndex<Integer> WOLF_COLLAR = new MetaIndex<>(WolfWatcher.class, 2, 14);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_16)
|
||||
@NmsAddedIn(NmsVersion.v1_16)
|
||||
public static MetaIndex<Integer> WOLF_ANGER = new MetaIndex<>(WolfWatcher.class, 3, 0);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_16)
|
||||
@NmsAddedIn(NmsVersion.v1_16)
|
||||
public static MetaIndex<Boolean> ZOGLIN_BABY = new MetaIndex<>(ZoglinWatcher.class, 0, false);
|
||||
|
||||
@NmsRemovedIn(val = NmsVersion.v1_14)
|
||||
@NmsRemovedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<Boolean> ZOMBIE_AGGRESSIVE = new MetaIndex<>(ZombieWatcher.class, 2, false);
|
||||
|
||||
public static MetaIndex<Boolean> ZOMBIE_BABY = new MetaIndex<>(ZombieWatcher.class, 0, false);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_13)
|
||||
@NmsAddedIn(NmsVersion.v1_13)
|
||||
public static MetaIndex<Boolean> ZOMBIE_CONVERTING_DROWNED = new MetaIndex<>(ZombieWatcher.class, 2, false);
|
||||
|
||||
public static MetaIndex<Integer> ZOMBIE_PLACEHOLDER = new MetaIndex<>(ZombieWatcher.class, 1, 0);
|
||||
|
||||
@NmsRemovedIn(val = NmsVersion.v1_14)
|
||||
@NmsRemovedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<Integer> ZOMBIE_VILLAGER_PROFESSION_OLD = new MetaIndex<>(ZombieVillagerWatcher.class, 1,
|
||||
0);
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public static MetaIndex<VillagerData> ZOMBIE_VILLAGER_PROFESSION = new MetaIndex<>(ZombieVillagerWatcher.class, 1,
|
||||
NmsVersion.v1_14.isSupported() ? new VillagerData(Villager.Type.PLAINS, Villager.Profession.NONE, 1) :
|
||||
null);
|
||||
|
@ -13,17 +13,17 @@ public class AbstractVillagerWatcher extends AgeableWatcher {
|
||||
super(disguise);
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public int getAngry() {
|
||||
return getData(MetaIndex.ABSTRACT_VILLAGER_ANGRY);
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public boolean isAngry() {
|
||||
return getAngry() > 0;
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public void setAngry(int ticks) {
|
||||
setData(MetaIndex.ABSTRACT_VILLAGER_ANGRY, ticks);
|
||||
sendData(MetaIndex.ABSTRACT_VILLAGER_ANGRY);
|
||||
|
@ -57,12 +57,12 @@ public class AreaEffectCloudWatcher extends FlagWatcher {
|
||||
sendData(MetaIndex.AREA_EFFECT_IGNORE_RADIUS);
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_13)
|
||||
@NmsAddedIn(NmsVersion.v1_13)
|
||||
public <T> void setParticle(Particle particle, T particleData) {
|
||||
setParticle(WrappedParticle.create(particle, particleData));
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_13)
|
||||
@NmsAddedIn(NmsVersion.v1_13)
|
||||
public WrappedParticle getParticle() {
|
||||
if (NmsVersion.v1_13.isSupported()) {
|
||||
return getData(MetaIndex.AREA_EFFECT_PARTICLE);
|
||||
@ -75,7 +75,7 @@ public class AreaEffectCloudWatcher extends FlagWatcher {
|
||||
}
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_13)
|
||||
@NmsAddedIn(NmsVersion.v1_13)
|
||||
public void setParticle(WrappedParticle particle) {
|
||||
if (NmsVersion.v1_13.isSupported()) {
|
||||
setData(MetaIndex.AREA_EFFECT_PARTICLE, particle);
|
||||
|
@ -20,12 +20,12 @@ public class ArrowWatcher extends FlagWatcher {
|
||||
sendData(MetaIndex.ARROW_CRITICAL);
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public int getPierceLevel() {
|
||||
return getData(MetaIndex.ARROW_PIERCE_LEVEL);
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public void setPierceLevel(int pierceLevel) {
|
||||
setData(MetaIndex.ARROW_PIERCE_LEVEL, (byte) pierceLevel);
|
||||
sendData(MetaIndex.ARROW_PIERCE_LEVEL);
|
||||
|
@ -8,7 +8,7 @@ import me.libraryaddict.disguise.utilities.reflection.NmsVersion;
|
||||
/**
|
||||
* Created by libraryaddict on 14/12/2019.
|
||||
*/
|
||||
@NmsAddedIn(value = NmsVersion.v1_15)
|
||||
@NmsAddedIn(NmsVersion.v1_15)
|
||||
public class BeeWatcher extends AgeableWatcher {
|
||||
public BeeWatcher(Disguise disguise) {
|
||||
super(disguise);
|
||||
|
@ -41,12 +41,12 @@ public class BoatWatcher extends FlagWatcher {
|
||||
sendData(MetaIndex.BOAT_LEFT_PADDLING);
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_13)
|
||||
@NmsAddedIn(NmsVersion.v1_13)
|
||||
public int getBoatShake() {
|
||||
return getData(MetaIndex.BOAT_SHAKE);
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_13)
|
||||
@NmsAddedIn(NmsVersion.v1_13)
|
||||
public void setBoatShake(int number) {
|
||||
setData(MetaIndex.BOAT_SHAKE, number);
|
||||
sendData(MetaIndex.BOAT_SHAKE);
|
||||
|
@ -15,7 +15,7 @@ import java.util.Random;
|
||||
/**
|
||||
* Created by libraryaddict on 6/05/2019.
|
||||
*/
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public class CatWatcher extends TameableWatcher {
|
||||
public CatWatcher(Disguise disguise) {
|
||||
super(disguise);
|
||||
|
@ -20,12 +20,12 @@ public class EnderSignalWatcher extends FlagWatcher {
|
||||
}
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public ItemStack getItemStack() {
|
||||
return getData(MetaIndex.ENDER_SIGNAL_ITEM);
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public void setItemStack(ItemStack item) {
|
||||
setData(MetaIndex.ENDER_SIGNAL_ITEM, item);
|
||||
sendData(MetaIndex.ENDER_SIGNAL_ITEM);
|
||||
|
@ -20,12 +20,12 @@ public class FireballWatcher extends FlagWatcher {
|
||||
}
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public ItemStack getItemStack() {
|
||||
return getData(MetaIndex.FIREBALL_ITEM);
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public void setItemStack(ItemStack item) {
|
||||
setData(MetaIndex.FIREBALL_ITEM, item);
|
||||
sendData(MetaIndex.FIREBALL_ITEM);
|
||||
|
@ -35,18 +35,18 @@ public class FireworkWatcher extends FlagWatcher {
|
||||
sendData(MetaIndex.FIREWORK_ITEM);
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public boolean isShotAtAngle() {
|
||||
return getData(MetaIndex.FIREWORK_SHOT_AT_ANGLE);
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public void setShotAtAngle(boolean shotAtAngle) {
|
||||
setData(MetaIndex.FIREWORK_SHOT_AT_ANGLE, shotAtAngle);
|
||||
sendData(MetaIndex.FIREWORK_SHOT_AT_ANGLE);
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public OptionalInt getAttachedEntityOpt() {
|
||||
return getData(MetaIndex.FIREWORK_ATTACHED_ENTITY);
|
||||
}
|
||||
@ -59,7 +59,7 @@ public class FireworkWatcher extends FlagWatcher {
|
||||
setAttachedEntity(entityId == 0 ? OptionalInt.empty() : OptionalInt.of(entityId));
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public void setAttachedEntity(OptionalInt entityId) {
|
||||
if (NmsVersion.v1_14.isSupported()) {
|
||||
setData(MetaIndex.FIREWORK_ATTACHED_ENTITY, entityId);
|
||||
|
@ -13,7 +13,7 @@ import java.util.Random;
|
||||
/**
|
||||
* Created by libraryaddict on 6/05/2019.
|
||||
*/
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public class FoxWatcher extends AgeableWatcher {
|
||||
public FoxWatcher(Disguise disguise) {
|
||||
super(disguise);
|
||||
|
@ -12,25 +12,25 @@ public class IllagerWizardWatcher extends IllagerWatcher {
|
||||
super(disguise);
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public Spellcaster.Spell getSpell() {
|
||||
return Spellcaster.Spell.values()[getData(MetaIndex.ILLAGER_SPELL)];
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public void setSpell(Spellcaster.Spell spell) {
|
||||
setData(MetaIndex.ILLAGER_SPELL, (byte) spell.ordinal());
|
||||
sendData(MetaIndex.ILLAGER_SPELL);
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
@NmsRemovedIn(val = NmsVersion.v1_14)
|
||||
@NmsRemovedIn(NmsVersion.v1_14)
|
||||
public int getSpellTicks() {
|
||||
return getData(MetaIndex.ILLAGER_SPELL_TICKS);
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
@NmsRemovedIn(val = NmsVersion.v1_14)
|
||||
@NmsRemovedIn(NmsVersion.v1_14)
|
||||
public void setSpellTicks(int spellTicks) {
|
||||
setData(MetaIndex.ILLAGER_SPELL_TICKS, (byte) spellTicks);
|
||||
sendData(MetaIndex.ILLAGER_SPELL_TICKS);
|
||||
|
@ -43,12 +43,12 @@ public class InsentientWatcher extends LivingWatcher {
|
||||
return (getData(MetaIndex.INSENTIENT_META) & i) != 0;
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public boolean isEnraged() {
|
||||
return getInsentientFlag(4);
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public void setEnraged(boolean enraged) {
|
||||
setInsentientFlag(4, enraged);
|
||||
}
|
||||
|
@ -40,12 +40,12 @@ public class LivingWatcher extends FlagWatcher {
|
||||
return clone;
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public BlockPosition getBedPosition() {
|
||||
return getData(MetaIndex.LIVING_BED_POSITION).orElse(null);
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public void setBedPosition(BlockPosition blockPosition) {
|
||||
Optional<BlockPosition> optional;
|
||||
|
||||
@ -94,22 +94,22 @@ public class LivingWatcher extends FlagWatcher {
|
||||
sendData(MetaIndex.LIVING_HAND);
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_13)
|
||||
@NmsAddedIn(NmsVersion.v1_13)
|
||||
public boolean isRightClicking() {
|
||||
return getHandFlag(0);
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_13)
|
||||
@NmsAddedIn(NmsVersion.v1_13)
|
||||
public void setRightClicking(boolean setRightClicking) {
|
||||
setHandFlag(0, setRightClicking);
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_13)
|
||||
@NmsAddedIn(NmsVersion.v1_13)
|
||||
public boolean isSpinning() {
|
||||
return getHandFlag(2);
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_13)
|
||||
@NmsAddedIn(NmsVersion.v1_13)
|
||||
public void setSpinning(boolean setSpinning) {
|
||||
setHandFlag(2, setSpinning);
|
||||
}
|
||||
|
@ -14,12 +14,12 @@ public class MushroomCowWatcher extends AgeableWatcher {
|
||||
super(disguise);
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public MushroomCow.Variant getVariant() {
|
||||
return MushroomCow.Variant.valueOf(getData(MetaIndex.MUSHROOM_COW_TYPE).toUpperCase());
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public void setVariant(MushroomCow.Variant variant) {
|
||||
setData(MetaIndex.MUSHROOM_COW_TYPE, variant.name().toLowerCase());
|
||||
sendData(MetaIndex.MUSHROOM_COW_TYPE);
|
||||
|
@ -16,67 +16,67 @@ public class OcelotWatcher extends AgeableWatcher {
|
||||
super(disguise);
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public boolean isTrusting() {
|
||||
return getData(MetaIndex.OCELOT_TRUST);
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public void setTrusting(boolean trusting) {
|
||||
setData(MetaIndex.OCELOT_TRUST, trusting);
|
||||
sendData(MetaIndex.OCELOT_TRUST);
|
||||
}
|
||||
|
||||
@NmsRemovedIn(val = NmsVersion.v1_14)
|
||||
@NmsRemovedIn(NmsVersion.v1_14)
|
||||
@Deprecated
|
||||
public Ocelot.Type getType() {
|
||||
return Ocelot.Type.getType(getData(MetaIndex.OCELOT_TYPE));
|
||||
}
|
||||
|
||||
@NmsRemovedIn(val = NmsVersion.v1_14)
|
||||
@NmsRemovedIn(NmsVersion.v1_14)
|
||||
@Deprecated
|
||||
public void setType(Ocelot.Type newType) {
|
||||
setData(MetaIndex.OCELOT_TYPE, newType.getId());
|
||||
sendData(MetaIndex.OCELOT_TYPE);
|
||||
}
|
||||
|
||||
@NmsRemovedIn(val = NmsVersion.v1_14)
|
||||
@NmsRemovedIn(NmsVersion.v1_14)
|
||||
public Optional<UUID> getOwner() {
|
||||
return getData(MetaIndex.TAMEABLE_OWNER);
|
||||
}
|
||||
|
||||
@NmsRemovedIn(val = NmsVersion.v1_14)
|
||||
@NmsRemovedIn(NmsVersion.v1_14)
|
||||
public void setOwner(UUID owner) {
|
||||
setData(MetaIndex.TAMEABLE_OWNER, Optional.of(owner));
|
||||
sendData(MetaIndex.TAMEABLE_OWNER);
|
||||
}
|
||||
|
||||
@NmsRemovedIn(val = NmsVersion.v1_14)
|
||||
@NmsRemovedIn(NmsVersion.v1_14)
|
||||
public boolean isSitting() {
|
||||
return isTameableFlag(1);
|
||||
}
|
||||
|
||||
@NmsRemovedIn(val = NmsVersion.v1_14)
|
||||
@NmsRemovedIn(NmsVersion.v1_14)
|
||||
public void setSitting(boolean sitting) {
|
||||
setTameableFlag(1, sitting);
|
||||
}
|
||||
|
||||
@NmsRemovedIn(val = NmsVersion.v1_14)
|
||||
@NmsRemovedIn(NmsVersion.v1_14)
|
||||
public boolean isTamed() {
|
||||
return isTameableFlag(4);
|
||||
}
|
||||
|
||||
@NmsRemovedIn(val = NmsVersion.v1_14)
|
||||
@NmsRemovedIn(NmsVersion.v1_14)
|
||||
public void setTamed(boolean tamed) {
|
||||
setTameableFlag(4, tamed);
|
||||
}
|
||||
|
||||
@NmsRemovedIn(val = NmsVersion.v1_14)
|
||||
@NmsRemovedIn(NmsVersion.v1_14)
|
||||
protected boolean isTameableFlag(int no) {
|
||||
return (getData(MetaIndex.TAMEABLE_META) & no) != 0;
|
||||
}
|
||||
|
||||
@NmsRemovedIn(val = NmsVersion.v1_14)
|
||||
@NmsRemovedIn(NmsVersion.v1_14)
|
||||
protected void setTameableFlag(int no, boolean flag) {
|
||||
byte value = getData(MetaIndex.TAMEABLE_META);
|
||||
|
||||
|
@ -13,7 +13,7 @@ import java.util.Random;
|
||||
/**
|
||||
* Created by libraryaddict on 6/05/2019.
|
||||
*/
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public class PandaWatcher extends AgeableWatcher {
|
||||
public PandaWatcher(Disguise disguise) {
|
||||
super(disguise);
|
||||
|
@ -8,7 +8,7 @@ import me.libraryaddict.disguise.utilities.reflection.NmsVersion;
|
||||
/**
|
||||
* Created by libraryaddict on 6/05/2019.
|
||||
*/
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public class PillagerWatcher extends IllagerWatcher {
|
||||
public PillagerWatcher(Disguise disguise) {
|
||||
super(disguise);
|
||||
|
@ -7,7 +7,7 @@ import me.libraryaddict.disguise.utilities.reflection.NmsVersion;
|
||||
/**
|
||||
* Created by libraryaddict on 6/05/2019.
|
||||
*/
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public class RavagerWatcher extends RaiderWatcher {
|
||||
public RavagerWatcher(Disguise disguise) {
|
||||
super(disguise);
|
||||
|
@ -14,13 +14,13 @@ public class SkeletonWatcher extends InsentientWatcher {
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
@NmsRemovedIn(val = NmsVersion.v1_14)
|
||||
@NmsRemovedIn(NmsVersion.v1_14)
|
||||
public boolean isSwingArms() {
|
||||
return getData(MetaIndex.SKELETON_SWING_ARMS);
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
@NmsRemovedIn(val = NmsVersion.v1_14)
|
||||
@NmsRemovedIn(NmsVersion.v1_14)
|
||||
public void setSwingArms(boolean swingingArms) {
|
||||
setData(MetaIndex.SKELETON_SWING_ARMS, swingingArms);
|
||||
sendData(MetaIndex.SKELETON_SWING_ARMS);
|
||||
|
@ -22,13 +22,13 @@ public abstract class ThrowableWatcher extends FlagWatcher {
|
||||
|
||||
protected abstract ItemStack getDefaultItemStack();
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public ItemStack getItemStack() {
|
||||
return getData(MetaIndex.THROWABLE_ITEM);
|
||||
}
|
||||
|
||||
@RandomDefaultValue
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public void setItemStack(ItemStack item) {
|
||||
setData(MetaIndex.THROWABLE_ITEM, item);
|
||||
sendData(MetaIndex.THROWABLE_ITEM);
|
||||
|
@ -7,7 +7,7 @@ import me.libraryaddict.disguise.utilities.reflection.NmsVersion;
|
||||
/**
|
||||
* Created by libraryaddict on 6/05/2019.
|
||||
*/
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public class TraderLlamaWatcher extends LlamaWatcher {
|
||||
public TraderLlamaWatcher(Disguise disguise) {
|
||||
super(disguise);
|
||||
|
@ -13,12 +13,12 @@ public class TridentWatcher extends ArrowWatcher {
|
||||
super(disguise);
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_15)
|
||||
@NmsAddedIn(NmsVersion.v1_15)
|
||||
public boolean isEnchanted() {
|
||||
return getData(MetaIndex.TRIDENT_ENCHANTED);
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_15)
|
||||
@NmsAddedIn(NmsVersion.v1_15)
|
||||
public void setEnchanted(boolean enchanted) {
|
||||
setData(MetaIndex.TRIDENT_ENCHANTED, enchanted);
|
||||
sendData(MetaIndex.TRIDENT_ENCHANTED);
|
||||
|
@ -21,12 +21,12 @@ public class VillagerWatcher extends AbstractVillagerWatcher {
|
||||
}
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public VillagerData getVillagerData() {
|
||||
return getData(MetaIndex.VILLAGER_DATA);
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public void setVillagerData(VillagerData villagerData) {
|
||||
setData(MetaIndex.VILLAGER_DATA, villagerData);
|
||||
sendData(MetaIndex.VILLAGER_DATA);
|
||||
@ -51,33 +51,33 @@ public class VillagerWatcher extends AbstractVillagerWatcher {
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public Villager.Type getType() {
|
||||
return getVillagerData().getType();
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public void setType(Villager.Type type) {
|
||||
setVillagerData(new VillagerData(type, getProfession(), getLevel()));
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public Villager.Type getBiome() {
|
||||
return getType();
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public void setBiome(Villager.Type type) {
|
||||
setType(type);
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public int getLevel() {
|
||||
return getVillagerData().getLevel();
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public void setLevel(int level) {
|
||||
setVillagerData(new VillagerData(getType(), getProfession(), level));
|
||||
}
|
||||
|
@ -12,13 +12,13 @@ public class VindicatorWatcher extends IllagerWatcher {
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
@NmsRemovedIn(val = NmsVersion.v1_14)
|
||||
@NmsRemovedIn(NmsVersion.v1_14)
|
||||
public boolean isJohnny() {
|
||||
return getData(MetaIndex.ILLAGER_META) == 1;
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
@NmsRemovedIn(val = NmsVersion.v1_14)
|
||||
@NmsRemovedIn(NmsVersion.v1_14)
|
||||
public void setJohnny(boolean isJohnny) {
|
||||
setData(MetaIndex.ILLAGER_META, (byte) (isJohnny ? 1 : 0));
|
||||
sendData(MetaIndex.ILLAGER_META);
|
||||
|
@ -66,7 +66,7 @@ public class WolfWatcher extends TameableWatcher {
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@NmsRemovedIn(val = NmsVersion.v1_15)
|
||||
@NmsRemovedIn(NmsVersion.v1_15)
|
||||
@Deprecated
|
||||
public float getDamageTaken() {
|
||||
return getData(MetaIndex.WOLF_DAMAGE);
|
||||
@ -78,7 +78,7 @@ public class WolfWatcher extends TameableWatcher {
|
||||
* @param damage
|
||||
*/
|
||||
@Deprecated
|
||||
@NmsRemovedIn(val = NmsVersion.v1_15)
|
||||
@NmsRemovedIn(NmsVersion.v1_15)
|
||||
public void setDamageTaken(float damage) {
|
||||
setData(MetaIndex.WOLF_DAMAGE, damage);
|
||||
sendData(MetaIndex.WOLF_DAMAGE);
|
||||
|
@ -44,12 +44,12 @@ public class ZombieVillagerWatcher extends ZombieWatcher {
|
||||
}
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public VillagerData getVillagerData() {
|
||||
return getData(MetaIndex.ZOMBIE_VILLAGER_PROFESSION);
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public void setVillagerData(VillagerData villagerData) {
|
||||
setData(MetaIndex.ZOMBIE_VILLAGER_PROFESSION, villagerData);
|
||||
sendData(MetaIndex.ZOMBIE_VILLAGER_PROFESSION);
|
||||
@ -69,34 +69,34 @@ public class ZombieVillagerWatcher extends ZombieWatcher {
|
||||
}
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public Villager.Type getType() {
|
||||
return getVillagerData().getType();
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public void setType(Villager.Type type) {
|
||||
setVillagerData(new VillagerData(type, getProfession(), getLevel()));
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public int getLevel() {
|
||||
return getVillagerData().getLevel();
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public void setLevel(int level) {
|
||||
setVillagerData(new VillagerData(getType(), getProfession(), getLevel()));
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public Villager.Type getBiome() {
|
||||
return getType();
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_14)
|
||||
@NmsAddedIn(NmsVersion.v1_14)
|
||||
public void setBiome(Villager.Type type) {
|
||||
setType(type);
|
||||
}
|
||||
|
@ -33,25 +33,25 @@ public class ZombieWatcher extends InsentientWatcher {
|
||||
setBaby(true);
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_13)
|
||||
@NmsAddedIn(NmsVersion.v1_13)
|
||||
public boolean isConverting() {
|
||||
return getData(MetaIndex.ZOMBIE_CONVERTING_DROWNED);
|
||||
}
|
||||
|
||||
@NmsAddedIn(value = NmsVersion.v1_13)
|
||||
@NmsAddedIn(NmsVersion.v1_13)
|
||||
public void setConverting(boolean converting) {
|
||||
setData(MetaIndex.ZOMBIE_CONVERTING_DROWNED, converting);
|
||||
sendData(MetaIndex.ZOMBIE_CONVERTING_DROWNED);
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
@NmsRemovedIn(val = NmsVersion.v1_14)
|
||||
@NmsRemovedIn(NmsVersion.v1_14)
|
||||
public boolean isAggressive() {
|
||||
return getData(MetaIndex.ZOMBIE_AGGRESSIVE);
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
@NmsRemovedIn(val = NmsVersion.v1_14)
|
||||
@NmsRemovedIn(NmsVersion.v1_14)
|
||||
public void setAggressive(boolean handsup) {
|
||||
setData(MetaIndex.ZOMBIE_AGGRESSIVE, handsup);
|
||||
sendData(MetaIndex.ZOMBIE_AGGRESSIVE);
|
||||
|
@ -8,5 +8,5 @@ import java.lang.annotation.RetentionPolicy;
|
||||
*/
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
public @interface NmsRemovedIn {
|
||||
NmsVersion val();
|
||||
NmsVersion value();
|
||||
}
|
||||
|
@ -58,11 +58,11 @@ public class ReflectionManager {
|
||||
private static Field chunkProviderField;
|
||||
private static Field entityTrackerField;
|
||||
private static Field trackedEntitiesField;
|
||||
@NmsRemovedIn(val = NmsVersion.v1_14)
|
||||
@NmsRemovedIn(NmsVersion.v1_14)
|
||||
private static Method ihmGet;
|
||||
@NmsRemovedIn(val = NmsVersion.v1_14)
|
||||
@NmsRemovedIn(NmsVersion.v1_14)
|
||||
private static Field trackerField;
|
||||
@NmsRemovedIn(val = NmsVersion.v1_14)
|
||||
@NmsRemovedIn(NmsVersion.v1_14)
|
||||
private static Field entitiesField;
|
||||
private static NmsVersion version;
|
||||
private static Method itemAsBukkitMethod;
|
||||
@ -272,7 +272,7 @@ public class ReflectionManager {
|
||||
if (obj.isAnnotationPresent(NmsRemovedIn.class)) {
|
||||
NmsRemovedIn removed = obj.getAnnotation(NmsRemovedIn.class);
|
||||
|
||||
return !removed.val().isSupported();
|
||||
return !removed.value().isSupported();
|
||||
}
|
||||
|
||||
return true;
|
||||
|
@ -122,9 +122,9 @@ public class CompileMethods {
|
||||
}
|
||||
|
||||
if (method.isAnnotationPresent(NmsRemovedIn.class)) {
|
||||
removed = method.getAnnotation(NmsRemovedIn.class).val().ordinal();
|
||||
removed = method.getAnnotation(NmsRemovedIn.class).value().ordinal();
|
||||
} else if (method.getDeclaringClass().isAnnotationPresent(NmsRemovedIn.class)) {
|
||||
removed = method.getDeclaringClass().getAnnotation(NmsRemovedIn.class).val().ordinal();
|
||||
removed = method.getDeclaringClass().getAnnotation(NmsRemovedIn.class).value().ordinal();
|
||||
}
|
||||
|
||||
String param = method.getParameterCount() == 1 ? method.getParameterTypes()[0].getName() : "";
|
||||
|
Loading…
Reference in New Issue
Block a user