From bbe143520e00bb29702b39b9a9a8020f67de910d Mon Sep 17 00:00:00 2001 From: Konstantin Shandurenko Date: Tue, 23 Feb 2021 18:37:00 +0300 Subject: [PATCH] A bit more changes to EntityMeta --- .../minestom/server/entity/EntityType.java | 8 ++--- .../entitytypes/EntityTypeEnumGenerator.java | 16 +++++---- .../net/minestom/server/entity/Entity.java | 19 +++++++--- .../entity/metadata/AgeableMobMeta.java | 8 ++--- .../entity/metadata/BaseEntityMeta.java | 36 +++++++++---------- .../server/entity/metadata/EntityMeta.java | 5 ++- .../entity/metadata/LivingEntityMeta.java | 28 +++++++-------- .../server/entity/metadata/MobMeta.java | 5 +-- .../entity/metadata/PathfinderMobMeta.java | 5 +-- .../server/entity/metadata/PlayerMeta.java | 25 +++++++------ .../metadata/ambient/AmbientCreatureMeta.java | 5 +-- .../entity/metadata/ambient/BatMeta.java | 5 +-- .../metadata/animal/AbstractHorseMeta.java | 8 ++--- .../entity/metadata/animal/AnimalMeta.java | 5 +-- .../entity/metadata/animal/BeeMeta.java | 8 ++--- .../metadata/animal/ChestedHorseMeta.java | 8 ++--- .../entity/metadata/animal/ChickenMeta.java | 5 +-- .../entity/metadata/animal/CowMeta.java | 5 +-- .../entity/metadata/animal/DonkeyMeta.java | 5 +-- .../entity/metadata/animal/FoxMeta.java | 16 ++++----- .../entity/metadata/animal/HoglinMeta.java | 8 ++--- .../entity/metadata/animal/HorseMeta.java | 8 ++--- .../entity/metadata/animal/LlamaMeta.java | 16 ++++----- .../entity/metadata/animal/MooshroomMeta.java | 8 ++--- .../entity/metadata/animal/MuleMeta.java | 5 +-- .../entity/metadata/animal/OcelotMeta.java | 8 ++--- .../entity/metadata/animal/PandaMeta.java | 24 ++++++------- .../entity/metadata/animal/PigMeta.java | 12 +++---- .../entity/metadata/animal/PolarBearMeta.java | 8 ++--- .../entity/metadata/animal/RabbitMeta.java | 8 ++--- .../entity/metadata/animal/SheepMeta.java | 5 +-- .../metadata/animal/SkeletonHorseMeta.java | 5 +-- .../entity/metadata/animal/StriderMeta.java | 16 ++++----- .../entity/metadata/animal/TurtleMeta.java | 28 +++++++-------- .../metadata/animal/ZombieHorseMeta.java | 5 +-- .../metadata/animal/tameable/CatMeta.java | 20 +++++------ .../metadata/animal/tameable/ParrotMeta.java | 8 ++--- .../animal/tameable/TameableAnimalMeta.java | 8 ++--- .../metadata/animal/tameable/WolfMeta.java | 16 ++++----- .../metadata/arrow/AbstractArrowMeta.java | 8 ++--- .../entity/metadata/arrow/ArrowMeta.java | 8 ++--- .../metadata/arrow/SpectralArrowMeta.java | 5 +-- .../metadata/arrow/ThrownTridentMeta.java | 12 +++---- .../entity/metadata/flying/FlyingMeta.java | 5 +-- .../entity/metadata/flying/GhastMeta.java | 8 ++--- .../entity/metadata/flying/PhantomMeta.java | 8 ++--- .../metadata/golem/AbstractGolemMeta.java | 5 +-- .../entity/metadata/golem/IronGolemMeta.java | 5 +-- .../entity/metadata/golem/ShulkerMeta.java | 20 +++++------ .../entity/metadata/golem/SnowGolemMeta.java | 8 ++--- .../AbstractMinecartContainerMeta.java | 5 +-- .../minecart/AbstractMinecartMeta.java | 24 ++++++------- .../metadata/minecart/ChestMinecartMeta.java | 5 +-- .../minecart/CommandBlockMinecartMeta.java | 12 +++---- .../minecart/FurnaceMinecartMeta.java | 8 ++--- .../metadata/minecart/HopperMinecartMeta.java | 5 +-- .../metadata/minecart/MinecartMeta.java | 5 +-- .../minecart/SpawnerMinecartMeta.java | 5 +-- .../metadata/minecart/TntMinecartMeta.java | 5 +-- .../metadata/monster/BasePiglinMeta.java | 8 ++--- .../entity/metadata/monster/BlazeMeta.java | 5 +-- .../metadata/monster/CaveSpiderMeta.java | 5 +-- .../entity/metadata/monster/CreeperMeta.java | 16 ++++----- .../metadata/monster/ElderGuardianMeta.java | 5 +-- .../entity/metadata/monster/EndermanMeta.java | 16 ++++----- .../metadata/monster/EndermiteMeta.java | 5 +-- .../entity/metadata/monster/GiantMeta.java | 5 +-- .../entity/metadata/monster/GuardianMeta.java | 10 +++--- .../entity/metadata/monster/MonsterMeta.java | 5 +-- .../metadata/monster/PiglinBruteMeta.java | 5 +-- .../entity/metadata/monster/PiglinMeta.java | 16 ++++----- .../metadata/monster/SilverfishMeta.java | 5 +-- .../entity/metadata/monster/SpiderMeta.java | 5 +-- .../entity/metadata/monster/VexMeta.java | 5 +-- .../entity/metadata/monster/WitherMeta.java | 14 ++++---- .../entity/metadata/monster/ZoglinMeta.java | 8 ++--- .../monster/raider/AbstractIllagerMeta.java | 5 +-- .../metadata/monster/raider/EvokerMeta.java | 5 +-- .../monster/raider/IllusionerMeta.java | 5 +-- .../metadata/monster/raider/PillagerMeta.java | 5 +-- .../metadata/monster/raider/RaiderMeta.java | 8 ++--- .../metadata/monster/raider/RavagerMeta.java | 5 +-- .../raider/SpellcasterIllagerMeta.java | 8 ++--- .../monster/raider/VindicatorMeta.java | 5 +-- .../metadata/monster/raider/WitchMeta.java | 8 ++--- .../skeleton/AbstractSkeletonMeta.java | 5 +-- .../monster/skeleton/SkeletonMeta.java | 5 +-- .../metadata/monster/skeleton/StrayMeta.java | 5 +-- .../monster/skeleton/WitherSkeletonMeta.java | 5 +-- .../metadata/monster/zombie/DrownedMeta.java | 5 +-- .../metadata/monster/zombie/HuskMeta.java | 5 +-- .../metadata/monster/zombie/ZombieMeta.java | 12 +++---- .../monster/zombie/ZombieVillagerMeta.java | 12 +++---- .../monster/zombie/ZombifiedPiglinMeta.java | 5 +-- .../metadata/object/EyeOfEnderMeta.java | 5 +-- .../entity/metadata/object/FireballMeta.java | 5 +-- .../metadata/object/ItemEntityMeta.java | 5 +-- .../metadata/object/ObjectEntityMeta.java | 8 ++--- .../metadata/object/SmallFireballMeta.java | 5 +-- .../entity/metadata/object/SnowballMeta.java | 5 +-- .../entity/metadata/object/ThrownEggMeta.java | 5 +-- .../metadata/object/ThrownEnderPearlMeta.java | 5 +-- .../object/ThrownExperienceBottleMeta.java | 5 +-- .../metadata/object/ThrownPotionMeta.java | 5 +-- .../metadata/other/AreaEffectCloudMeta.java | 20 +++++------ .../entity/metadata/other/ArmorStandMeta.java | 29 ++++++++------- .../entity/metadata/other/BoatMeta.java | 32 ++++++++--------- .../metadata/other/DragonFireballMeta.java | 5 +-- .../entity/metadata/other/EndCrystalMeta.java | 12 +++---- .../metadata/other/EnderDragonMeta.java | 8 ++--- .../metadata/other/EvokerFangsMeta.java | 5 +-- .../metadata/other/ExperienceOrbMeta.java | 5 +-- .../metadata/other/FallingBlockMeta.java | 8 ++--- .../metadata/other/FireworkRocketMeta.java | 14 ++++---- .../metadata/other/FishingHookMeta.java | 10 +++--- .../entity/metadata/other/ItemFrameMeta.java | 12 +++---- .../entity/metadata/other/LeashKnotMeta.java | 5 +-- .../metadata/other/LightningBoltMeta.java | 5 +-- .../entity/metadata/other/LlamaSpitMeta.java | 5 +-- .../entity/metadata/other/MagmaCubeMeta.java | 5 ++- .../entity/metadata/other/PaintingMeta.java | 5 +-- .../entity/metadata/other/PrimedTntMeta.java | 8 ++--- .../metadata/other/ShulkerBulletMeta.java | 5 +-- .../entity/metadata/other/SlimeMeta.java | 8 ++--- .../metadata/other/TraderLlamaMeta.java | 5 +-- .../metadata/other/WitherSkullMeta.java | 8 ++--- .../villager/AbstractVillagerMeta.java | 8 ++--- .../metadata/villager/VillagerMeta.java | 8 ++--- .../villager/WanderingTraderMeta.java | 5 +-- .../entity/metadata/water/DolphinMeta.java | 16 ++++----- .../entity/metadata/water/SquidMeta.java | 5 +-- .../metadata/water/WaterAnimalMeta.java | 5 +-- .../metadata/water/fish/AbstractFishMeta.java | 8 ++--- .../entity/metadata/water/fish/CodMeta.java | 5 +-- .../metadata/water/fish/PufferfishMeta.java | 8 ++--- .../metadata/water/fish/SalmonMeta.java | 5 +-- .../metadata/water/fish/TropicalFishMeta.java | 8 ++--- src/test/java/demo/commands/HorseCommand.java | 2 +- src/test/java/demo/commands/ShootCommand.java | 2 +- 139 files changed, 647 insertions(+), 568 deletions(-) diff --git a/src/autogenerated/java/net/minestom/server/entity/EntityType.java b/src/autogenerated/java/net/minestom/server/entity/EntityType.java index 03cd31805..89176087d 100644 --- a/src/autogenerated/java/net/minestom/server/entity/EntityType.java +++ b/src/autogenerated/java/net/minestom/server/entity/EntityType.java @@ -1,6 +1,6 @@ package net.minestom.server.entity; -import java.util.function.Function; +import java.util.function.BiFunction; import net.minestom.server.entity.metadata.EntityMeta; import net.minestom.server.entity.metadata.PlayerMeta; import net.minestom.server.entity.metadata.ambient.BatMeta; @@ -345,10 +345,10 @@ public enum EntityType { private double height; @NotNull - private Function metaConstructor; + private BiFunction metaConstructor; EntityType(@NotNull String namespaceID, double width, double height, - @NotNull Function metaConstructor) { + @NotNull BiFunction metaConstructor) { this.namespaceID = namespaceID; this.width = width; this.height = height; @@ -372,7 +372,7 @@ public enum EntityType { return this.height; } - public Function getMetaConstructor() { + public BiFunction getMetaConstructor() { return this.metaConstructor; } diff --git a/src/generators/java/net/minestom/codegen/entitytypes/EntityTypeEnumGenerator.java b/src/generators/java/net/minestom/codegen/entitytypes/EntityTypeEnumGenerator.java index 781d685f4..4104663dc 100644 --- a/src/generators/java/net/minestom/codegen/entitytypes/EntityTypeEnumGenerator.java +++ b/src/generators/java/net/minestom/codegen/entitytypes/EntityTypeEnumGenerator.java @@ -8,6 +8,7 @@ import net.minestom.codegen.ConstructorLambda; import net.minestom.codegen.EnumGenerator; import net.minestom.codegen.MinestomEnumGenerator; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import net.minestom.server.entity.metadata.EntityMeta; import net.minestom.server.registry.Registries; import net.minestom.server.registry.ResourceGatherer; @@ -22,6 +23,7 @@ import java.io.IOException; import java.io.InputStreamReader; import java.net.URL; import java.util.*; +import java.util.function.BiFunction; import java.util.function.Function; /** @@ -130,9 +132,10 @@ public class EntityTypeEnumGenerator extends MinestomEnumGenerator { @@ -153,9 +156,10 @@ public class EntityTypeEnumGenerator extends MinestomEnumGenerator code.addStatement("return this.metaConstructor") ); diff --git a/src/main/java/net/minestom/server/entity/Entity.java b/src/main/java/net/minestom/server/entity/Entity.java index 1c6f97baa..40c974dfa 100644 --- a/src/main/java/net/minestom/server/entity/Entity.java +++ b/src/main/java/net/minestom/server/entity/Entity.java @@ -8,6 +8,7 @@ import net.minestom.server.collision.BoundingBox; import net.minestom.server.collision.CollisionUtils; import net.minestom.server.data.Data; import net.minestom.server.data.DataContainer; +import net.minestom.server.entity.metadata.EntityMeta; import net.minestom.server.event.Event; import net.minestom.server.event.EventCallback; import net.minestom.server.event.entity.*; @@ -123,6 +124,7 @@ public abstract class Entity implements Viewable, EventHandler, DataContainer, P private final Map, Collection> eventCallbacks = new ConcurrentHashMap<>(); protected Metadata metadata = new Metadata(this); + protected EntityMeta entityMeta; private final List effects = new CopyOnWriteArrayList<>(); @@ -142,6 +144,8 @@ public abstract class Entity implements Viewable, EventHandler, DataContainer, P this.lastY = spawnPosition.getY(); this.lastZ = spawnPosition.getZ(); + this.entityMeta = entityType.getMetaConstructor().apply(this, this.metadata); + setBoundingBox(0, 0, 0); setAutoViewable(true); @@ -158,10 +162,6 @@ public abstract class Entity implements Viewable, EventHandler, DataContainer, P this(entityType, new Position()); } - public Metadata getMetadata() { - return this.metadata; - } - /** * Schedules a task to be run during the next entity tick. * It ensures that the task will be executed in the same thread as the entity (depending of the {@link ThreadProvider}). @@ -224,6 +224,17 @@ public abstract class Entity implements Viewable, EventHandler, DataContainer, P return onGround || EntityUtils.isOnGround(this) /* backup for levitating entities */; } + /** + * Gets metadata of this entity. + * You may want to cast it to specific implementation. + * + * @return metadata of this entity. + */ + @NotNull + public EntityMeta getEntityMeta() { + return this.entityMeta; + } + /** * Teleports the entity only if the chunk at {@code position} is loaded or if * {@link Instance#hasEnabledAutoChunkLoad()} returns true. diff --git a/src/main/java/net/minestom/server/entity/metadata/AgeableMobMeta.java b/src/main/java/net/minestom/server/entity/metadata/AgeableMobMeta.java index 91bfc2a20..6a51c1c61 100644 --- a/src/main/java/net/minestom/server/entity/metadata/AgeableMobMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/AgeableMobMeta.java @@ -7,12 +7,12 @@ import org.jetbrains.annotations.NotNull; public class AgeableMobMeta extends PathfinderMobMeta { - protected AgeableMobMeta(@NotNull Entity entity) { - super(entity); + protected AgeableMobMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public boolean isBaby() { - return getMetadata().getIndex((byte) 15, false); + return super.metadata.getIndex((byte) 15, false); } public void setBaby(boolean value) { @@ -25,7 +25,7 @@ public class AgeableMobMeta extends PathfinderMobMeta { } else { setBoundingBox(bb.getWidth() * 2, bb.getHeight() * 2); } - getMetadata().getIndex((byte) 15, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 15, Metadata.Boolean(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/BaseEntityMeta.java b/src/main/java/net/minestom/server/entity/metadata/BaseEntityMeta.java index f377278dc..0f8466de6 100644 --- a/src/main/java/net/minestom/server/entity/metadata/BaseEntityMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/BaseEntityMeta.java @@ -17,8 +17,8 @@ public class BaseEntityMeta extends EntityMeta { private final static byte HAS_GLOWING_EFFECT_BIT = 0x40; private final static byte FLYING_WITH_ELYTRA_BIT = (byte) 0x80; - protected BaseEntityMeta(@NotNull Entity entity) { - super(entity); + protected BaseEntityMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public boolean isOnFire() { @@ -78,63 +78,59 @@ public class BaseEntityMeta extends EntityMeta { } public int getAirTicks() { - return getMetadata().getIndex((byte) 1, 300); + return super.metadata.getIndex((byte) 1, 300); } public void setAirTicks(int value) { - getMetadata().setIndex((byte) 1, Metadata.VarInt(value)); + super.metadata.setIndex((byte) 1, Metadata.VarInt(value)); } public JsonMessage getCustomName() { - return getMetadata().getIndex((byte) 2, null); + return super.metadata.getIndex((byte) 2, null); } public void setCustomName(JsonMessage value) { - getMetadata().setIndex((byte) 2, Metadata.OptChat(value)); + super.metadata.setIndex((byte) 2, Metadata.OptChat(value)); } public boolean isCustomNameVisible() { - return getMetadata().getIndex((byte) 3, false); + return super.metadata.getIndex((byte) 3, false); } public void setCustomNameVisible(boolean value) { - getMetadata().setIndex((byte) 3, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 3, Metadata.Boolean(value)); } public boolean isSilent() { - return getMetadata().getIndex((byte) 4, false); + return super.metadata.getIndex((byte) 4, false); } public void setSilent(boolean value) { - getMetadata().setIndex((byte) 4, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 4, Metadata.Boolean(value)); } public boolean isHasNoGravity() { - return getMetadata().getIndex((byte) 5, false); + return super.metadata.getIndex((byte) 5, false); } public void setHasNoGravity(boolean value) { - getMetadata().setIndex((byte) 5, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 5, Metadata.Boolean(value)); } public Entity.Pose getPose() { - return getMetadata().getIndex((byte) 6, Entity.Pose.STANDING); + return super.metadata.getIndex((byte) 6, Entity.Pose.STANDING); } public void setPose(Entity.Pose value) { - getMetadata().setIndex((byte) 6, Metadata.Pose(value)); - } - - protected Metadata getMetadata() { - return this.entity.getMetadata(); + super.metadata.setIndex((byte) 6, Metadata.Pose(value)); } protected byte getMask(byte index) { - return getMetadata().getIndex(index, (byte) 0); + return super.metadata.getIndex(index, (byte) 0); } protected void setMask(byte index, byte mask) { - getMetadata().setIndex(index, Metadata.Byte(mask)); + super.metadata.setIndex(index, Metadata.Byte(mask)); } protected boolean getMaskBit(byte index, byte bit) { diff --git a/src/main/java/net/minestom/server/entity/metadata/EntityMeta.java b/src/main/java/net/minestom/server/entity/metadata/EntityMeta.java index 0a3a06874..51373b967 100644 --- a/src/main/java/net/minestom/server/entity/metadata/EntityMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/EntityMeta.java @@ -1,14 +1,17 @@ package net.minestom.server.entity.metadata; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class EntityMeta { protected final Entity entity; + protected final Metadata metadata; - protected EntityMeta(@NotNull Entity entity) { + protected EntityMeta(@NotNull Entity entity, @NotNull Metadata metadata) { this.entity = entity; + this.metadata = metadata; } } diff --git a/src/main/java/net/minestom/server/entity/metadata/LivingEntityMeta.java b/src/main/java/net/minestom/server/entity/metadata/LivingEntityMeta.java index dd9c863e2..6f4befe32 100644 --- a/src/main/java/net/minestom/server/entity/metadata/LivingEntityMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/LivingEntityMeta.java @@ -15,8 +15,8 @@ public class LivingEntityMeta extends BaseEntityMeta { private final static byte ACTIVE_HAND_BIT = 0x02; private final static byte IS_IN_SPIN_ATTACK_BIT = 0x04; - protected LivingEntityMeta(@NotNull Entity entity) { - super(entity); + protected LivingEntityMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public boolean isHandActive() { @@ -45,52 +45,52 @@ public class LivingEntityMeta extends BaseEntityMeta { } public float getHealth() { - return getMetadata().getIndex((byte) 8, 1F); + return super.metadata.getIndex((byte) 8, 1F); } public void setHealth(float value) { - getMetadata().setIndex((byte) 8, Metadata.Float(value)); + super.metadata.setIndex((byte) 8, Metadata.Float(value)); } public int getPotionEffectColor() { - return getMetadata().getIndex((byte) 9, 0); + return super.metadata.getIndex((byte) 9, 0); } public void setPotionEffectColor(int value) { - getMetadata().setIndex((byte) 9, Metadata.VarInt(value)); + super.metadata.setIndex((byte) 9, Metadata.VarInt(value)); } public boolean isPotionEffectAmbient() { - return getMetadata().getIndex((byte) 10, false); + return super.metadata.getIndex((byte) 10, false); } public void setPotionEffectAmbient(boolean value) { - getMetadata().setIndex((byte) 10, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 10, Metadata.Boolean(value)); } public int getNumberOfArrows() { - return getMetadata().getIndex((byte) 11, 0); + return super.metadata.getIndex((byte) 11, 0); } public void setNumberOfArrows(int value) { - getMetadata().getIndex((byte) 11, Metadata.VarInt(value)); + super.metadata.getIndex((byte) 11, Metadata.VarInt(value)); } public int getHealthAddedByAbsorption() { - return getMetadata().getIndex((byte) 12, 0); + return super.metadata.getIndex((byte) 12, 0); } public void setHealthAddedByAbsorption(int value) { - getMetadata().getIndex((byte) 12, Metadata.VarInt(value)); + super.metadata.getIndex((byte) 12, Metadata.VarInt(value)); } @Nullable public BlockPosition getBedInWhichSleepingPosition() { - return getMetadata().getIndex((byte) 13, null); + return super.metadata.getIndex((byte) 13, null); } public void setBedInWhichSleepingPosition(@Nullable BlockPosition value) { - getMetadata().setIndex((byte) 13, Metadata.OptPosition(value)); + super.metadata.setIndex((byte) 13, Metadata.OptPosition(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/MobMeta.java b/src/main/java/net/minestom/server/entity/metadata/MobMeta.java index 7e4e96fe6..c340fa9e0 100644 --- a/src/main/java/net/minestom/server/entity/metadata/MobMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/MobMeta.java @@ -1,6 +1,7 @@ package net.minestom.server.entity.metadata; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class MobMeta extends LivingEntityMeta { @@ -11,8 +12,8 @@ public class MobMeta extends LivingEntityMeta { private final static byte IS_LEFT_HANDED_BIT = 0x02; private final static byte IS_AGGRESSIVE_BIT = 0x04; - protected MobMeta(@NotNull Entity entity) { - super(entity); + protected MobMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public boolean isNoAi() { diff --git a/src/main/java/net/minestom/server/entity/metadata/PathfinderMobMeta.java b/src/main/java/net/minestom/server/entity/metadata/PathfinderMobMeta.java index ae736cd1c..9a4920d16 100644 --- a/src/main/java/net/minestom/server/entity/metadata/PathfinderMobMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/PathfinderMobMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class PathfinderMobMeta extends MobMeta { - protected PathfinderMobMeta(@NotNull Entity entity) { - super(entity); + protected PathfinderMobMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/PlayerMeta.java b/src/main/java/net/minestom/server/entity/metadata/PlayerMeta.java index 60791ac6e..1a17c0986 100644 --- a/src/main/java/net/minestom/server/entity/metadata/PlayerMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/PlayerMeta.java @@ -2,7 +2,6 @@ package net.minestom.server.entity.metadata; import net.minestom.server.entity.Entity; import net.minestom.server.entity.Metadata; -import net.minestom.server.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jglrxavpok.hephaistos.nbt.NBT; @@ -19,24 +18,24 @@ public class PlayerMeta extends LivingEntityMeta { private final static byte RIGHT_LEG_BIT = 0x20; private final static byte HAT_BIT = 0x40; - public PlayerMeta(@NotNull Entity entity) { - super(entity); + public PlayerMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public float getAdditionalHearts() { - return getMetadata().getIndex((byte) 14, 0F); + return super.metadata.getIndex((byte) 14, 0F); } public void setAdditionalHearts(float value) { - getMetadata().setIndex((byte) 14, Metadata.Float(value)); + super.metadata.setIndex((byte) 14, Metadata.Float(value)); } public int getScore() { - return getMetadata().getIndex((byte) 15, 0); + return super.metadata.getIndex((byte) 15, 0); } public void setScore(int value) { - getMetadata().setIndex((byte) 15, Metadata.VarInt(value)); + super.metadata.setIndex((byte) 15, Metadata.VarInt(value)); } public boolean isCapeEnabled() { @@ -96,29 +95,29 @@ public class PlayerMeta extends LivingEntityMeta { } public boolean isRightMainHand() { - return getMetadata().getIndex((byte) 17, (byte) 1) == (byte) 1; + return super.metadata.getIndex((byte) 17, (byte) 1) == (byte) 1; } public void setRightMainHand(boolean value) { - getMetadata().setIndex((byte) 17, Metadata.Byte(value ? (byte) 1 : (byte) 0)); + super.metadata.setIndex((byte) 17, Metadata.Byte(value ? (byte) 1 : (byte) 0)); } @Nullable public NBT getLeftShoulderEntityData() { - return getMetadata().getIndex((byte) 18, null); + return super.metadata.getIndex((byte) 18, null); } public void setLeftShoulderEntityData(@Nullable NBT value) { - getMetadata().setIndex((byte) 18, Metadata.NBT(value)); + super.metadata.setIndex((byte) 18, Metadata.NBT(value)); } @Nullable public NBT getRightShoulderEntityData() { - return getMetadata().getIndex((byte) 19, null); + return super.metadata.getIndex((byte) 19, null); } public void setRightShoulderEntityData(@Nullable NBT value) { - getMetadata().setIndex((byte) 19, Metadata.NBT(value)); + super.metadata.setIndex((byte) 19, Metadata.NBT(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/ambient/AmbientCreatureMeta.java b/src/main/java/net/minestom/server/entity/metadata/ambient/AmbientCreatureMeta.java index 1b12fb960..ab1a24279 100644 --- a/src/main/java/net/minestom/server/entity/metadata/ambient/AmbientCreatureMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/ambient/AmbientCreatureMeta.java @@ -1,13 +1,14 @@ package net.minestom.server.entity.metadata.ambient; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import net.minestom.server.entity.metadata.MobMeta; import org.jetbrains.annotations.NotNull; public class AmbientCreatureMeta extends MobMeta { - protected AmbientCreatureMeta(@NotNull Entity entity) { - super(entity); + protected AmbientCreatureMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/ambient/BatMeta.java b/src/main/java/net/minestom/server/entity/metadata/ambient/BatMeta.java index e10cdab39..ce048f2ef 100644 --- a/src/main/java/net/minestom/server/entity/metadata/ambient/BatMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/ambient/BatMeta.java @@ -1,6 +1,7 @@ package net.minestom.server.entity.metadata.ambient; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class BatMeta extends AmbientCreatureMeta { @@ -9,8 +10,8 @@ public class BatMeta extends AmbientCreatureMeta { private final static byte IS_HANGING_BIT = 0x01; - public BatMeta(@NotNull Entity entity) { - super(entity); + public BatMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public boolean isHanging() { diff --git a/src/main/java/net/minestom/server/entity/metadata/animal/AbstractHorseMeta.java b/src/main/java/net/minestom/server/entity/metadata/animal/AbstractHorseMeta.java index c4d0f03ec..1455f0f84 100644 --- a/src/main/java/net/minestom/server/entity/metadata/animal/AbstractHorseMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/animal/AbstractHorseMeta.java @@ -17,8 +17,8 @@ public class AbstractHorseMeta extends AnimalMeta { private final static byte REARING_BIT = 0x20; private final static byte MOUTH_OPEN_BIT = 0x40; - protected AbstractHorseMeta(@NotNull Entity entity) { - super(entity); + protected AbstractHorseMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public boolean isTamed() { @@ -70,11 +70,11 @@ public class AbstractHorseMeta extends AnimalMeta { } public UUID getOwner() { - return getMetadata().getIndex((byte) 17, null); + return super.metadata.getIndex((byte) 17, null); } public void setOwner(UUID value) { - getMetadata().setIndex((byte) 17, Metadata.OptUUID(value)); + super.metadata.setIndex((byte) 17, Metadata.OptUUID(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/animal/AnimalMeta.java b/src/main/java/net/minestom/server/entity/metadata/animal/AnimalMeta.java index bc02993f8..e34ef8604 100644 --- a/src/main/java/net/minestom/server/entity/metadata/animal/AnimalMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/animal/AnimalMeta.java @@ -1,13 +1,14 @@ package net.minestom.server.entity.metadata.animal; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import net.minestom.server.entity.metadata.AgeableMobMeta; import org.jetbrains.annotations.NotNull; public class AnimalMeta extends AgeableMobMeta { - protected AnimalMeta(@NotNull Entity entity) { - super(entity); + protected AnimalMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/animal/BeeMeta.java b/src/main/java/net/minestom/server/entity/metadata/animal/BeeMeta.java index 3b8d75200..2267bb03a 100644 --- a/src/main/java/net/minestom/server/entity/metadata/animal/BeeMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/animal/BeeMeta.java @@ -12,8 +12,8 @@ public class BeeMeta extends AnimalMeta { private final static byte HAS_STUNG_BIT = 0x04; private final static byte HAS_NECTAR_BIT = 0x08; - public BeeMeta(@NotNull Entity entity) { - super(entity); + public BeeMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public boolean isAngry() { @@ -41,11 +41,11 @@ public class BeeMeta extends AnimalMeta { } public int getAngerTicks() { - return getMetadata().getIndex((byte) 17, 0); + return super.metadata.getIndex((byte) 17, 0); } public void setAngerTicks(int value) { - getMetadata().setIndex((byte) 17, Metadata.VarInt(value)); + super.metadata.setIndex((byte) 17, Metadata.VarInt(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/animal/ChestedHorseMeta.java b/src/main/java/net/minestom/server/entity/metadata/animal/ChestedHorseMeta.java index 282d5d274..9793257ad 100644 --- a/src/main/java/net/minestom/server/entity/metadata/animal/ChestedHorseMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/animal/ChestedHorseMeta.java @@ -6,16 +6,16 @@ import org.jetbrains.annotations.NotNull; public class ChestedHorseMeta extends AbstractHorseMeta { - protected ChestedHorseMeta(@NotNull Entity entity) { - super(entity); + protected ChestedHorseMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public boolean isHasChest() { - return getMetadata().getIndex((byte) 18, false); + return super.metadata.getIndex((byte) 18, false); } public void setHasChest(boolean value) { - getMetadata().setIndex((byte) 18, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 18, Metadata.Boolean(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/animal/ChickenMeta.java b/src/main/java/net/minestom/server/entity/metadata/animal/ChickenMeta.java index 35779ba05..422324d24 100644 --- a/src/main/java/net/minestom/server/entity/metadata/animal/ChickenMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/animal/ChickenMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata.animal; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class ChickenMeta extends AnimalMeta { - public ChickenMeta(@NotNull Entity entity) { - super(entity); + public ChickenMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/animal/CowMeta.java b/src/main/java/net/minestom/server/entity/metadata/animal/CowMeta.java index eaa984393..6c86455bc 100644 --- a/src/main/java/net/minestom/server/entity/metadata/animal/CowMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/animal/CowMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata.animal; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class CowMeta extends AnimalMeta { - public CowMeta(@NotNull Entity entity) { - super(entity); + public CowMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/animal/DonkeyMeta.java b/src/main/java/net/minestom/server/entity/metadata/animal/DonkeyMeta.java index b7294ce0e..62dba04b6 100644 --- a/src/main/java/net/minestom/server/entity/metadata/animal/DonkeyMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/animal/DonkeyMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata.animal; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class DonkeyMeta extends ChestedHorseMeta { - public DonkeyMeta(@NotNull Entity entity) { - super(entity); + public DonkeyMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/animal/FoxMeta.java b/src/main/java/net/minestom/server/entity/metadata/animal/FoxMeta.java index 553d5972b..6701e6651 100644 --- a/src/main/java/net/minestom/server/entity/metadata/animal/FoxMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/animal/FoxMeta.java @@ -19,17 +19,17 @@ public class FoxMeta extends AnimalMeta { private final static byte FACEPLANTED_BIT = 0x40; private final static byte DEFENDING_BIT = (byte) 0x80; - public FoxMeta(@NotNull Entity entity) { - super(entity); + public FoxMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } @NotNull public Type getType() { - return Type.VALUES[getMetadata().getIndex((byte) 16, 0)]; + return Type.VALUES[super.metadata.getIndex((byte) 16, 0)]; } public void setType(@NotNull Type type) { - getMetadata().setIndex((byte) 16, Metadata.VarInt(type.ordinal())); + super.metadata.setIndex((byte) 16, Metadata.VarInt(type.ordinal())); } public boolean isSitting() { @@ -90,20 +90,20 @@ public class FoxMeta extends AnimalMeta { @Nullable public UUID getFirstUUID() { - return getMetadata().getIndex((byte) 18, null); + return super.metadata.getIndex((byte) 18, null); } public void setFirstUUID(@Nullable UUID value) { - getMetadata().setIndex((byte) 18, Metadata.OptUUID(value)); + super.metadata.setIndex((byte) 18, Metadata.OptUUID(value)); } @Nullable public UUID getSecondUUID() { - return getMetadata().getIndex((byte) 19, null); + return super.metadata.getIndex((byte) 19, null); } public void setSecondUUID(@Nullable UUID value) { - getMetadata().setIndex((byte) 19, Metadata.OptUUID(value)); + super.metadata.setIndex((byte) 19, Metadata.OptUUID(value)); } public enum Type { diff --git a/src/main/java/net/minestom/server/entity/metadata/animal/HoglinMeta.java b/src/main/java/net/minestom/server/entity/metadata/animal/HoglinMeta.java index 62879979a..c3a31e156 100644 --- a/src/main/java/net/minestom/server/entity/metadata/animal/HoglinMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/animal/HoglinMeta.java @@ -6,16 +6,16 @@ import org.jetbrains.annotations.NotNull; public class HoglinMeta extends AnimalMeta { - public HoglinMeta(@NotNull Entity entity) { - super(entity); + public HoglinMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public boolean isImmuneToZombification() { - return getMetadata().getIndex((byte) 16, false); + return super.metadata.getIndex((byte) 16, false); } public void setImmuneToZombification(boolean value) { - getMetadata().setIndex((byte) 16, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 16, Metadata.Boolean(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/animal/HorseMeta.java b/src/main/java/net/minestom/server/entity/metadata/animal/HorseMeta.java index 14247509b..4c12c69a9 100644 --- a/src/main/java/net/minestom/server/entity/metadata/animal/HorseMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/animal/HorseMeta.java @@ -6,16 +6,16 @@ import org.jetbrains.annotations.NotNull; public class HorseMeta extends AbstractHorseMeta { - public HorseMeta(@NotNull Entity entity) { - super(entity); + public HorseMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public Variant getVariant() { - return getVariantFromID(getMetadata().getIndex((byte) 18, 0)); + return getVariantFromID(super.metadata.getIndex((byte) 18, 0)); } public void setVariant(Variant variant) { - getMetadata().setIndex((byte) 18, Metadata.VarInt(getVariantID(variant.marking, variant.color))); + super.metadata.setIndex((byte) 18, Metadata.VarInt(getVariantID(variant.marking, variant.color))); } public static int getVariantID(@NotNull Marking marking, @NotNull Color color) { diff --git a/src/main/java/net/minestom/server/entity/metadata/animal/LlamaMeta.java b/src/main/java/net/minestom/server/entity/metadata/animal/LlamaMeta.java index 606166990..b62701d87 100644 --- a/src/main/java/net/minestom/server/entity/metadata/animal/LlamaMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/animal/LlamaMeta.java @@ -6,32 +6,32 @@ import org.jetbrains.annotations.NotNull; public class LlamaMeta extends ChestedHorseMeta { - public LlamaMeta(@NotNull Entity entity) { - super(entity); + public LlamaMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public int getStrength() { - return getMetadata().getIndex((byte) 19, 0); + return super.metadata.getIndex((byte) 19, 0); } public void setStrength(int value) { - getMetadata().setIndex((byte) 19, Metadata.VarInt(value)); + super.metadata.setIndex((byte) 19, Metadata.VarInt(value)); } public int getCarpetColor() { - return getMetadata().getIndex((byte) 20, -1); + return super.metadata.getIndex((byte) 20, -1); } public void setCarpetColor(int value) { - getMetadata().setIndex((byte) 20, Metadata.VarInt(value)); + super.metadata.setIndex((byte) 20, Metadata.VarInt(value)); } public Variant getVariant() { - return Variant.VALUES[getMetadata().getIndex((byte) 21, 0)]; + return Variant.VALUES[super.metadata.getIndex((byte) 21, 0)]; } public void setVariant(Variant value) { - getMetadata().setIndex((byte) 21, Metadata.VarInt(value.ordinal())); + super.metadata.setIndex((byte) 21, Metadata.VarInt(value.ordinal())); } public enum Variant { diff --git a/src/main/java/net/minestom/server/entity/metadata/animal/MooshroomMeta.java b/src/main/java/net/minestom/server/entity/metadata/animal/MooshroomMeta.java index 60cff39ef..ee580ed2a 100644 --- a/src/main/java/net/minestom/server/entity/metadata/animal/MooshroomMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/animal/MooshroomMeta.java @@ -8,17 +8,17 @@ import java.util.Locale; public class MooshroomMeta extends CowMeta { - public MooshroomMeta(@NotNull Entity entity) { - super(entity); + public MooshroomMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } @NotNull public Variant getVariant() { - return Variant.valueOf(getMetadata().getIndex((byte) 16, "red").toUpperCase(Locale.ROOT)); + return Variant.valueOf(super.metadata.getIndex((byte) 16, "red").toUpperCase(Locale.ROOT)); } public void setVariant(@NotNull Variant value) { - getMetadata().setIndex((byte) 16, Metadata.String(value.name().toLowerCase(Locale.ROOT))); + super.metadata.setIndex((byte) 16, Metadata.String(value.name().toLowerCase(Locale.ROOT))); } public enum Variant { diff --git a/src/main/java/net/minestom/server/entity/metadata/animal/MuleMeta.java b/src/main/java/net/minestom/server/entity/metadata/animal/MuleMeta.java index 025adf145..661ff00c2 100644 --- a/src/main/java/net/minestom/server/entity/metadata/animal/MuleMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/animal/MuleMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata.animal; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class MuleMeta extends ChestedHorseMeta { - public MuleMeta(@NotNull Entity entity) { - super(entity); + public MuleMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/animal/OcelotMeta.java b/src/main/java/net/minestom/server/entity/metadata/animal/OcelotMeta.java index 5fb002a04..5869835f7 100644 --- a/src/main/java/net/minestom/server/entity/metadata/animal/OcelotMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/animal/OcelotMeta.java @@ -6,16 +6,16 @@ import org.jetbrains.annotations.NotNull; public class OcelotMeta extends AnimalMeta { - public OcelotMeta(@NotNull Entity entity) { - super(entity); + public OcelotMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public boolean isTrusting() { - return getMetadata().getIndex((byte) 16, false); + return super.metadata.getIndex((byte) 16, false); } public void setTrusting(boolean value) { - getMetadata().setIndex((byte) 16, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 16, Metadata.Boolean(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/animal/PandaMeta.java b/src/main/java/net/minestom/server/entity/metadata/animal/PandaMeta.java index f8635c364..298ea0763 100644 --- a/src/main/java/net/minestom/server/entity/metadata/animal/PandaMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/animal/PandaMeta.java @@ -13,50 +13,50 @@ public class PandaMeta extends AnimalMeta { private final static byte SITTING_BIT = 0x08; private final static byte ON_BACK_BIT = 0x10; - public PandaMeta(@NotNull Entity entity) { - super(entity); + public PandaMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public int getBreedTimer() { - return getMetadata().getIndex((byte) 16, 0); + return super.metadata.getIndex((byte) 16, 0); } public void setBreedTimer(int value) { - getMetadata().setIndex((byte) 16, Metadata.VarInt(value)); + super.metadata.setIndex((byte) 16, Metadata.VarInt(value)); } public int getSneezeTimer() { - return getMetadata().getIndex((byte) 17, 0); + return super.metadata.getIndex((byte) 17, 0); } public void setSneezeTimer(int value) { - getMetadata().setIndex((byte) 17, Metadata.VarInt(value)); + super.metadata.setIndex((byte) 17, Metadata.VarInt(value)); } public int getEatTimer() { - return getMetadata().getIndex((byte) 18, 0); + return super.metadata.getIndex((byte) 18, 0); } public void setEatTimer(int value) { - getMetadata().setIndex((byte) 18, Metadata.VarInt(value)); + super.metadata.setIndex((byte) 18, Metadata.VarInt(value)); } @NotNull public Gene getMainGene() { - return Gene.VALUES[getMetadata().getIndex((byte) 19, (byte) 0)]; + return Gene.VALUES[super.metadata.getIndex((byte) 19, (byte) 0)]; } public void setMainGene(@NotNull Gene value) { - getMetadata().setIndex((byte) 19, Metadata.Byte((byte) value.ordinal())); + super.metadata.setIndex((byte) 19, Metadata.Byte((byte) value.ordinal())); } @NotNull public Gene getHiddenGene() { - return Gene.VALUES[getMetadata().getIndex((byte) 20, (byte) 0)]; + return Gene.VALUES[super.metadata.getIndex((byte) 20, (byte) 0)]; } public void setHiddenGene(@NotNull Gene value) { - getMetadata().setIndex((byte) 20, Metadata.Byte((byte) value.ordinal())); + super.metadata.setIndex((byte) 20, Metadata.Byte((byte) value.ordinal())); } public boolean isSneezing() { diff --git a/src/main/java/net/minestom/server/entity/metadata/animal/PigMeta.java b/src/main/java/net/minestom/server/entity/metadata/animal/PigMeta.java index 76a542590..482ac2c1a 100644 --- a/src/main/java/net/minestom/server/entity/metadata/animal/PigMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/animal/PigMeta.java @@ -6,24 +6,24 @@ import org.jetbrains.annotations.NotNull; public class PigMeta extends AnimalMeta { - public PigMeta(@NotNull Entity entity) { - super(entity); + public PigMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public boolean isHasSaddle() { - return getMetadata().getIndex((byte) 16, false); + return super.metadata.getIndex((byte) 16, false); } public void setHasSaddle(boolean value) { - getMetadata().setIndex((byte) 16, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 16, Metadata.Boolean(value)); } public int getTimeToBoost() { - return getMetadata().getIndex((byte) 17, 0); + return super.metadata.getIndex((byte) 17, 0); } public void setTimeToBoost(int value) { - getMetadata().getIndex((byte) 17, Metadata.VarInt(value)); + super.metadata.getIndex((byte) 17, Metadata.VarInt(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/animal/PolarBearMeta.java b/src/main/java/net/minestom/server/entity/metadata/animal/PolarBearMeta.java index 283b28c7f..0da00b06c 100644 --- a/src/main/java/net/minestom/server/entity/metadata/animal/PolarBearMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/animal/PolarBearMeta.java @@ -6,16 +6,16 @@ import org.jetbrains.annotations.NotNull; public class PolarBearMeta extends AnimalMeta { - public PolarBearMeta(@NotNull Entity entity) { - super(entity); + public PolarBearMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public boolean isStandingUp() { - return getMetadata().getIndex((byte) 16, false); + return super.metadata.getIndex((byte) 16, false); } public void setStandingUp(boolean value) { - getMetadata().setIndex((byte) 16, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 16, Metadata.Boolean(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/animal/RabbitMeta.java b/src/main/java/net/minestom/server/entity/metadata/animal/RabbitMeta.java index 366b13a25..a24fb2d15 100644 --- a/src/main/java/net/minestom/server/entity/metadata/animal/RabbitMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/animal/RabbitMeta.java @@ -6,13 +6,13 @@ import org.jetbrains.annotations.NotNull; public class RabbitMeta extends AnimalMeta { - public RabbitMeta(@NotNull Entity entity) { - super(entity); + public RabbitMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } @NotNull public Type getType() { - int id = getMetadata().getIndex((byte) 16, 0); + int id = super.metadata.getIndex((byte) 16, 0); if (id == 99) { return Type.KILLER_BUNNY; } @@ -21,7 +21,7 @@ public class RabbitMeta extends AnimalMeta { public void setType(@NotNull Type value) { int id = value == Type.KILLER_BUNNY ? 99 : value.ordinal(); - getMetadata().setIndex((byte) 16, Metadata.VarInt(id)); + super.metadata.setIndex((byte) 16, Metadata.VarInt(id)); } public enum Type { diff --git a/src/main/java/net/minestom/server/entity/metadata/animal/SheepMeta.java b/src/main/java/net/minestom/server/entity/metadata/animal/SheepMeta.java index 20046c84b..4dc2c4805 100644 --- a/src/main/java/net/minestom/server/entity/metadata/animal/SheepMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/animal/SheepMeta.java @@ -1,6 +1,7 @@ package net.minestom.server.entity.metadata.animal; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class SheepMeta extends AnimalMeta { @@ -10,8 +11,8 @@ public class SheepMeta extends AnimalMeta { private final static byte COLOR_BITS = 0x0F; private final static byte SHEARED_BIT = 0x10; - public SheepMeta(@NotNull Entity entity) { - super(entity); + public SheepMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public int getColor() { diff --git a/src/main/java/net/minestom/server/entity/metadata/animal/SkeletonHorseMeta.java b/src/main/java/net/minestom/server/entity/metadata/animal/SkeletonHorseMeta.java index 309e297d7..c644d783e 100644 --- a/src/main/java/net/minestom/server/entity/metadata/animal/SkeletonHorseMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/animal/SkeletonHorseMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata.animal; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class SkeletonHorseMeta extends AbstractHorseMeta { - public SkeletonHorseMeta(@NotNull Entity entity) { - super(entity); + public SkeletonHorseMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/animal/StriderMeta.java b/src/main/java/net/minestom/server/entity/metadata/animal/StriderMeta.java index c448076f2..8ad2cf944 100644 --- a/src/main/java/net/minestom/server/entity/metadata/animal/StriderMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/animal/StriderMeta.java @@ -6,32 +6,32 @@ import org.jetbrains.annotations.NotNull; public class StriderMeta extends AnimalMeta { - public StriderMeta(@NotNull Entity entity) { - super(entity); + public StriderMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public int getTimeToBoost() { - return getMetadata().getIndex((byte) 16, 0); + return super.metadata.getIndex((byte) 16, 0); } public void setTimeToBoost(int value) { - getMetadata().setIndex((byte) 16, Metadata.VarInt(value)); + super.metadata.setIndex((byte) 16, Metadata.VarInt(value)); } public boolean isShaking() { - return getMetadata().getIndex((byte) 17, false); + return super.metadata.getIndex((byte) 17, false); } public void setShaking(boolean value) { - getMetadata().setIndex((byte) 17, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 17, Metadata.Boolean(value)); } public boolean isHasSaddle() { - return getMetadata().getIndex((byte) 18, false); + return super.metadata.getIndex((byte) 18, false); } public void setHasSaddle(boolean value) { - getMetadata().setIndex((byte) 18, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 18, Metadata.Boolean(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/animal/TurtleMeta.java b/src/main/java/net/minestom/server/entity/metadata/animal/TurtleMeta.java index 652e84ba5..299bdae87 100644 --- a/src/main/java/net/minestom/server/entity/metadata/animal/TurtleMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/animal/TurtleMeta.java @@ -7,58 +7,58 @@ import org.jetbrains.annotations.NotNull; public class TurtleMeta extends AnimalMeta { - public TurtleMeta(@NotNull Entity entity) { - super(entity); + public TurtleMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } @NotNull public BlockPosition getHomePosition() { - return getMetadata().getIndex((byte) 16, new BlockPosition(0, 0, 0)); + return super.metadata.getIndex((byte) 16, new BlockPosition(0, 0, 0)); } public void setBlockPosition(@NotNull BlockPosition value) { - getMetadata().setIndex((byte) 16, Metadata.Position(value)); + super.metadata.setIndex((byte) 16, Metadata.Position(value)); } public boolean isHasEgg() { - return getMetadata().getIndex((byte) 17, false); + return super.metadata.getIndex((byte) 17, false); } public void setHasEgg(boolean value) { - getMetadata().setIndex((byte) 17, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 17, Metadata.Boolean(value)); } public boolean isLayingEgg() { - return getMetadata().getIndex((byte) 18, false); + return super.metadata.getIndex((byte) 18, false); } public void setLayingEgg(boolean value) { - getMetadata().setIndex((byte) 18, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 18, Metadata.Boolean(value)); } @NotNull public BlockPosition getTravelPosition() { - return getMetadata().getIndex((byte) 19, new BlockPosition(0, 0, 0)); + return super.metadata.getIndex((byte) 19, new BlockPosition(0, 0, 0)); } public void setTravelPosition(@NotNull BlockPosition value) { - getMetadata().setIndex((byte) 19, Metadata.Position(value)); + super.metadata.setIndex((byte) 19, Metadata.Position(value)); } public boolean isGoingHome() { - return getMetadata().getIndex((byte) 20, false); + return super.metadata.getIndex((byte) 20, false); } public void setGoingHome(boolean value) { - getMetadata().setIndex((byte) 20, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 20, Metadata.Boolean(value)); } public boolean isTravelling() { - return getMetadata().getIndex((byte) 21, false); + return super.metadata.getIndex((byte) 21, false); } public void setTravelling(boolean value) { - getMetadata().setIndex((byte) 21, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 21, Metadata.Boolean(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/animal/ZombieHorseMeta.java b/src/main/java/net/minestom/server/entity/metadata/animal/ZombieHorseMeta.java index be373b9d9..b5efa4b9b 100644 --- a/src/main/java/net/minestom/server/entity/metadata/animal/ZombieHorseMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/animal/ZombieHorseMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata.animal; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class ZombieHorseMeta extends AbstractHorseMeta { - public ZombieHorseMeta(@NotNull Entity entity) { - super(entity); + public ZombieHorseMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/animal/tameable/CatMeta.java b/src/main/java/net/minestom/server/entity/metadata/animal/tameable/CatMeta.java index 9bcb815a9..4c32fe10b 100644 --- a/src/main/java/net/minestom/server/entity/metadata/animal/tameable/CatMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/animal/tameable/CatMeta.java @@ -6,41 +6,41 @@ import org.jetbrains.annotations.NotNull; public class CatMeta extends TameableAnimalMeta { - public CatMeta(@NotNull Entity entity) { - super(entity); + public CatMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } @NotNull public Color getColor() { - return Color.VALUES[getMetadata().getIndex((byte) 18, 1)]; + return Color.VALUES[super.metadata.getIndex((byte) 18, 1)]; } public void setColor(@NotNull Color value) { - getMetadata().setIndex((byte) 18, Metadata.VarInt(value.ordinal())); + super.metadata.setIndex((byte) 18, Metadata.VarInt(value.ordinal())); } public boolean isLying() { - return getMetadata().getIndex((byte) 19, false); + return super.metadata.getIndex((byte) 19, false); } public void setLying(boolean value) { - getMetadata().setIndex((byte) 19, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 19, Metadata.Boolean(value)); } public boolean isRelaxed() { - return getMetadata().getIndex((byte) 20, false); + return super.metadata.getIndex((byte) 20, false); } public void setRelaxed(boolean value) { - getMetadata().setIndex((byte) 20, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 20, Metadata.Boolean(value)); } public int getCollarColor() { - return getMetadata().getIndex((byte) 21, 14); + return super.metadata.getIndex((byte) 21, 14); } public void setCollarColor(int value) { - getMetadata().setIndex((byte) 21, Metadata.VarInt(value)); + super.metadata.setIndex((byte) 21, Metadata.VarInt(value)); } public enum Color { diff --git a/src/main/java/net/minestom/server/entity/metadata/animal/tameable/ParrotMeta.java b/src/main/java/net/minestom/server/entity/metadata/animal/tameable/ParrotMeta.java index 5915a6c9c..603d1feb4 100644 --- a/src/main/java/net/minestom/server/entity/metadata/animal/tameable/ParrotMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/animal/tameable/ParrotMeta.java @@ -6,17 +6,17 @@ import org.jetbrains.annotations.NotNull; public class ParrotMeta extends TameableAnimalMeta { - public ParrotMeta(@NotNull Entity entity) { - super(entity); + public ParrotMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } @NotNull public Color getColor() { - return Color.VALUES[getMetadata().getIndex((byte) 18, 0)]; + return Color.VALUES[super.metadata.getIndex((byte) 18, 0)]; } public void setColor(@NotNull Color value) { - getMetadata().setIndex((byte) 18, Metadata.VarInt(value.ordinal())); + super.metadata.setIndex((byte) 18, Metadata.VarInt(value.ordinal())); } public enum Color { diff --git a/src/main/java/net/minestom/server/entity/metadata/animal/tameable/TameableAnimalMeta.java b/src/main/java/net/minestom/server/entity/metadata/animal/tameable/TameableAnimalMeta.java index b52702f58..90d06be95 100644 --- a/src/main/java/net/minestom/server/entity/metadata/animal/tameable/TameableAnimalMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/animal/tameable/TameableAnimalMeta.java @@ -14,8 +14,8 @@ public class TameableAnimalMeta extends AnimalMeta { private final static byte SITTING_BIT = 0x01; private final static byte TAMED_BIT = 0x04; - protected TameableAnimalMeta(@NotNull Entity entity) { - super(entity); + protected TameableAnimalMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public boolean isSitting() { @@ -36,11 +36,11 @@ public class TameableAnimalMeta extends AnimalMeta { @NotNull public UUID getOwner() { - return getMetadata().getIndex((byte) 17, null); + return super.metadata.getIndex((byte) 17, null); } public void setOwner(@NotNull UUID value) { - getMetadata().setIndex((byte) 17, Metadata.OptUUID(value)); + super.metadata.setIndex((byte) 17, Metadata.OptUUID(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/animal/tameable/WolfMeta.java b/src/main/java/net/minestom/server/entity/metadata/animal/tameable/WolfMeta.java index bbb3f20b4..2a6959822 100644 --- a/src/main/java/net/minestom/server/entity/metadata/animal/tameable/WolfMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/animal/tameable/WolfMeta.java @@ -6,32 +6,32 @@ import org.jetbrains.annotations.NotNull; public class WolfMeta extends TameableAnimalMeta { - public WolfMeta(@NotNull Entity entity) { - super(entity); + public WolfMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public boolean isBegging() { - return getMetadata().getIndex((byte) 18, false); + return super.metadata.getIndex((byte) 18, false); } public void setBegging(boolean value) { - getMetadata().setIndex((byte) 18, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 18, Metadata.Boolean(value)); } public int getCollarColor() { - return getMetadata().getIndex((byte) 19, 14); + return super.metadata.getIndex((byte) 19, 14); } public void setCollarColor(int value) { - getMetadata().setIndex((byte) 19, Metadata.VarInt(value)); + super.metadata.setIndex((byte) 19, Metadata.VarInt(value)); } public int getAngerTime() { - return getMetadata().getIndex((byte) 20, 0); + return super.metadata.getIndex((byte) 20, 0); } public void setAngerTime(int value) { - getMetadata().setIndex((byte) 20, Metadata.VarInt(value)); + super.metadata.setIndex((byte) 20, Metadata.VarInt(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/arrow/AbstractArrowMeta.java b/src/main/java/net/minestom/server/entity/metadata/arrow/AbstractArrowMeta.java index 438ae0dee..449905f4a 100644 --- a/src/main/java/net/minestom/server/entity/metadata/arrow/AbstractArrowMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/arrow/AbstractArrowMeta.java @@ -12,8 +12,8 @@ public class AbstractArrowMeta extends BaseEntityMeta { private final static byte CRITICAL_BIT = 0x01; private final static byte NO_CLIP_BIT = 0x01; - protected AbstractArrowMeta(@NotNull Entity entity) { - super(entity); + protected AbstractArrowMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public boolean isCritical() { @@ -33,11 +33,11 @@ public class AbstractArrowMeta extends BaseEntityMeta { } public byte getPiercingLevel() { - return getMetadata().getIndex((byte) 8, (byte) 0); + return super.metadata.getIndex((byte) 8, (byte) 0); } public void setPiercingLevel(byte value) { - getMetadata().setIndex((byte) 8, Metadata.Byte(value)); + super.metadata.setIndex((byte) 8, Metadata.Byte(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/arrow/ArrowMeta.java b/src/main/java/net/minestom/server/entity/metadata/arrow/ArrowMeta.java index 992a63986..0f2f23252 100644 --- a/src/main/java/net/minestom/server/entity/metadata/arrow/ArrowMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/arrow/ArrowMeta.java @@ -7,16 +7,16 @@ import org.jetbrains.annotations.NotNull; public class ArrowMeta extends BaseEntityMeta { - public ArrowMeta(@NotNull Entity entity) { - super(entity); + public ArrowMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public int getColor() { - return getMetadata().getIndex((byte) 9, -1); + return super.metadata.getIndex((byte) 9, -1); } public void setColor(int value) { - getMetadata().setIndex((byte) 9, Metadata.VarInt(value)); + super.metadata.setIndex((byte) 9, Metadata.VarInt(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/arrow/SpectralArrowMeta.java b/src/main/java/net/minestom/server/entity/metadata/arrow/SpectralArrowMeta.java index 8b0768cf3..3bb69fb05 100644 --- a/src/main/java/net/minestom/server/entity/metadata/arrow/SpectralArrowMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/arrow/SpectralArrowMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata.arrow; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class SpectralArrowMeta extends AbstractArrowMeta { - public SpectralArrowMeta(@NotNull Entity entity) { - super(entity); + public SpectralArrowMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/arrow/ThrownTridentMeta.java b/src/main/java/net/minestom/server/entity/metadata/arrow/ThrownTridentMeta.java index e21a364d2..2ab3cd990 100644 --- a/src/main/java/net/minestom/server/entity/metadata/arrow/ThrownTridentMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/arrow/ThrownTridentMeta.java @@ -6,24 +6,24 @@ import org.jetbrains.annotations.NotNull; public class ThrownTridentMeta extends AbstractArrowMeta { - public ThrownTridentMeta(@NotNull Entity entity) { - super(entity); + public ThrownTridentMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public int getLoyaltyLevel() { - return getMetadata().getIndex((byte) 9, 0); + return super.metadata.getIndex((byte) 9, 0); } public void setLoyaltyLevel(int value) { - getMetadata().setIndex((byte) 9, Metadata.VarInt(value)); + super.metadata.setIndex((byte) 9, Metadata.VarInt(value)); } public boolean isHasEnchantmentGlint() { - return getMetadata().getIndex((byte) 10, false); + return super.metadata.getIndex((byte) 10, false); } public void setHasEnchantmentGlint(boolean value) { - getMetadata().setIndex((byte) 10, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 10, Metadata.Boolean(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/flying/FlyingMeta.java b/src/main/java/net/minestom/server/entity/metadata/flying/FlyingMeta.java index 86259d12b..84b8d6fab 100644 --- a/src/main/java/net/minestom/server/entity/metadata/flying/FlyingMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/flying/FlyingMeta.java @@ -1,13 +1,14 @@ package net.minestom.server.entity.metadata.flying; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import net.minestom.server.entity.metadata.MobMeta; import org.jetbrains.annotations.NotNull; public class FlyingMeta extends MobMeta { - protected FlyingMeta(@NotNull Entity entity) { - super(entity); + protected FlyingMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/flying/GhastMeta.java b/src/main/java/net/minestom/server/entity/metadata/flying/GhastMeta.java index a7084b6d1..d7d3068a9 100644 --- a/src/main/java/net/minestom/server/entity/metadata/flying/GhastMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/flying/GhastMeta.java @@ -6,16 +6,16 @@ import org.jetbrains.annotations.NotNull; public class GhastMeta extends FlyingMeta { - public GhastMeta(@NotNull Entity entity) { - super(entity); + public GhastMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public boolean isAttacking() { - return getMetadata().getIndex((byte) 15, false); + return super.metadata.getIndex((byte) 15, false); } public void setAttacking(boolean value) { - getMetadata().setIndex((byte) 15, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 15, Metadata.Boolean(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/flying/PhantomMeta.java b/src/main/java/net/minestom/server/entity/metadata/flying/PhantomMeta.java index 41d6c89f3..2cf2317d6 100644 --- a/src/main/java/net/minestom/server/entity/metadata/flying/PhantomMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/flying/PhantomMeta.java @@ -6,16 +6,16 @@ import org.jetbrains.annotations.NotNull; public class PhantomMeta extends FlyingMeta { - public PhantomMeta(@NotNull Entity entity) { - super(entity); + public PhantomMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public int getSize() { - return getMetadata().getIndex((byte) 15, 0); + return super.metadata.getIndex((byte) 15, 0); } public void setSize(int value) { - getMetadata().setIndex((byte) 15, Metadata.VarInt(value)); + super.metadata.setIndex((byte) 15, Metadata.VarInt(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/golem/AbstractGolemMeta.java b/src/main/java/net/minestom/server/entity/metadata/golem/AbstractGolemMeta.java index b56f3f4bb..dfbbc2b61 100644 --- a/src/main/java/net/minestom/server/entity/metadata/golem/AbstractGolemMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/golem/AbstractGolemMeta.java @@ -1,13 +1,14 @@ package net.minestom.server.entity.metadata.golem; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import net.minestom.server.entity.metadata.PathfinderMobMeta; import org.jetbrains.annotations.NotNull; public class AbstractGolemMeta extends PathfinderMobMeta { - protected AbstractGolemMeta(@NotNull Entity entity) { - super(entity); + protected AbstractGolemMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/golem/IronGolemMeta.java b/src/main/java/net/minestom/server/entity/metadata/golem/IronGolemMeta.java index ae6777a72..af0de2ff9 100644 --- a/src/main/java/net/minestom/server/entity/metadata/golem/IronGolemMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/golem/IronGolemMeta.java @@ -1,6 +1,7 @@ package net.minestom.server.entity.metadata.golem; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class IronGolemMeta extends AbstractGolemMeta { @@ -9,8 +10,8 @@ public class IronGolemMeta extends AbstractGolemMeta { private final static byte PLAYER_CREATED_BIT = 0x01; - public IronGolemMeta(@NotNull Entity entity) { - super(entity); + public IronGolemMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public boolean isPlayerCreated() { diff --git a/src/main/java/net/minestom/server/entity/metadata/golem/ShulkerMeta.java b/src/main/java/net/minestom/server/entity/metadata/golem/ShulkerMeta.java index 450672929..1269d9c05 100644 --- a/src/main/java/net/minestom/server/entity/metadata/golem/ShulkerMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/golem/ShulkerMeta.java @@ -8,40 +8,40 @@ import org.jetbrains.annotations.NotNull; public class ShulkerMeta extends AbstractGolemMeta { - public ShulkerMeta(@NotNull Entity entity) { - super(entity); + public ShulkerMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public Direction getAttachFace() { - return getMetadata().getIndex((byte) 15, Direction.DOWN); + return super.metadata.getIndex((byte) 15, Direction.DOWN); } public void setAttachFace(Direction value) { - getMetadata().setIndex((byte) 15, Metadata.Direction(value)); + super.metadata.setIndex((byte) 15, Metadata.Direction(value)); } public BlockPosition getAttachmentPosition() { - return getMetadata().getIndex((byte) 16, null); + return super.metadata.getIndex((byte) 16, null); } public void setAttachmentPosition(BlockPosition value) { - getMetadata().setIndex((byte) 16, Metadata.OptPosition(value)); + super.metadata.setIndex((byte) 16, Metadata.OptPosition(value)); } public byte getShieldHeight() { - return getMetadata().getIndex((byte) 17, (byte) 0); + return super.metadata.getIndex((byte) 17, (byte) 0); } public void setShieldHeight(byte value) { - getMetadata().setIndex((byte) 17, Metadata.Byte(value)); + super.metadata.setIndex((byte) 17, Metadata.Byte(value)); } public byte getColor() { - return getMetadata().getIndex((byte) 18, (byte) 10); + return super.metadata.getIndex((byte) 18, (byte) 10); } public void setColor(byte value) { - getMetadata().setIndex((byte) 18, Metadata.Byte(value)); + super.metadata.setIndex((byte) 18, Metadata.Byte(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/golem/SnowGolemMeta.java b/src/main/java/net/minestom/server/entity/metadata/golem/SnowGolemMeta.java index ecbfef53a..143b7f7e8 100644 --- a/src/main/java/net/minestom/server/entity/metadata/golem/SnowGolemMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/golem/SnowGolemMeta.java @@ -6,16 +6,16 @@ import org.jetbrains.annotations.NotNull; public class SnowGolemMeta extends AbstractGolemMeta { - public SnowGolemMeta(@NotNull Entity entity) { - super(entity); + public SnowGolemMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public boolean isHasPumpkinHat() { - return getMetadata().getIndex((byte) 15, (byte) 0x10) == (byte) 0x10; + return super.metadata.getIndex((byte) 15, (byte) 0x10) == (byte) 0x10; } public void setHasPumpkinHat(boolean value) { - getMetadata().setIndex((byte) 15, Metadata.Byte(value ? (byte) 0x10 : (byte) 0x00)); + super.metadata.setIndex((byte) 15, Metadata.Byte(value ? (byte) 0x10 : (byte) 0x00)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/minecart/AbstractMinecartContainerMeta.java b/src/main/java/net/minestom/server/entity/metadata/minecart/AbstractMinecartContainerMeta.java index 6f143a622..7b468abce 100644 --- a/src/main/java/net/minestom/server/entity/metadata/minecart/AbstractMinecartContainerMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/minecart/AbstractMinecartContainerMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata.minecart; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class AbstractMinecartContainerMeta extends AbstractMinecartMeta { - protected AbstractMinecartContainerMeta(@NotNull Entity entity) { - super(entity); + protected AbstractMinecartContainerMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/minecart/AbstractMinecartMeta.java b/src/main/java/net/minestom/server/entity/metadata/minecart/AbstractMinecartMeta.java index 9b8aa670a..a3c6927ce 100644 --- a/src/main/java/net/minestom/server/entity/metadata/minecart/AbstractMinecartMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/minecart/AbstractMinecartMeta.java @@ -7,49 +7,49 @@ import org.jetbrains.annotations.NotNull; public class AbstractMinecartMeta extends BaseEntityMeta { - protected AbstractMinecartMeta(@NotNull Entity entity) { - super(entity); + protected AbstractMinecartMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public int getShakingPower() { - return getMetadata().getIndex((byte) 7, 0); + return super.metadata.getIndex((byte) 7, 0); } public void setShakingPower(int value) { - getMetadata().setIndex((byte) 7, Metadata.VarInt(value)); + super.metadata.setIndex((byte) 7, Metadata.VarInt(value)); } public int getShakingDirection() { - return getMetadata().getIndex((byte) 8, 1); + return super.metadata.getIndex((byte) 8, 1); } public void setShakingDirection(int value) { - getMetadata().setIndex((byte) 8, Metadata.VarInt(value)); + super.metadata.setIndex((byte) 8, Metadata.VarInt(value)); } public float getShakingMultiplier() { - return getMetadata().getIndex((byte) 9, 0F); + return super.metadata.getIndex((byte) 9, 0F); } public void setShakingMultiplier(float value) { - getMetadata().setIndex((byte) 9, Metadata.Float(value)); + super.metadata.setIndex((byte) 9, Metadata.Float(value)); } public int getCustomBlockIdAndDamage() { - return getMetadata().getIndex((byte) 10, 0); + return super.metadata.getIndex((byte) 10, 0); } public void setCustomBlockIdAndDamage(int value) { - getMetadata().setIndex((byte) 10, Metadata.VarInt(value)); + super.metadata.setIndex((byte) 10, Metadata.VarInt(value)); } // in 16th of a block public int getCustomBlockYPosition() { - return getMetadata().getIndex((byte) 11, 6); + return super.metadata.getIndex((byte) 11, 6); } public void setCustomBlockYPosition(int value) { - getMetadata().setIndex((byte) 11, Metadata.VarInt(value)); + super.metadata.setIndex((byte) 11, Metadata.VarInt(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/minecart/ChestMinecartMeta.java b/src/main/java/net/minestom/server/entity/metadata/minecart/ChestMinecartMeta.java index ee4a4987c..b5d32767f 100644 --- a/src/main/java/net/minestom/server/entity/metadata/minecart/ChestMinecartMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/minecart/ChestMinecartMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata.minecart; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class ChestMinecartMeta extends AbstractMinecartContainerMeta { - public ChestMinecartMeta(@NotNull Entity entity) { - super(entity); + public ChestMinecartMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/minecart/CommandBlockMinecartMeta.java b/src/main/java/net/minestom/server/entity/metadata/minecart/CommandBlockMinecartMeta.java index b60b20d0b..cbe5ed2f3 100644 --- a/src/main/java/net/minestom/server/entity/metadata/minecart/CommandBlockMinecartMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/minecart/CommandBlockMinecartMeta.java @@ -8,26 +8,26 @@ import org.jetbrains.annotations.NotNull; public class CommandBlockMinecartMeta extends AbstractMinecartMeta { - public CommandBlockMinecartMeta(@NotNull Entity entity) { - super(entity); + public CommandBlockMinecartMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } @NotNull public String getCommand() { - return getMetadata().getIndex((byte) 13, ""); + return super.metadata.getIndex((byte) 13, ""); } public void setCommand(@NotNull String value) { - getMetadata().setIndex((byte) 13, Metadata.String(value)); + super.metadata.setIndex((byte) 13, Metadata.String(value)); } @NotNull public JsonMessage getLastOutput() { - return getMetadata().getIndex((byte) 14, ColoredText.of("")); + return super.metadata.getIndex((byte) 14, ColoredText.of("")); } public void setLastOutput(@NotNull JsonMessage value) { - getMetadata().setIndex((byte) 14, Metadata.Chat(value)); + super.metadata.setIndex((byte) 14, Metadata.Chat(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/minecart/FurnaceMinecartMeta.java b/src/main/java/net/minestom/server/entity/metadata/minecart/FurnaceMinecartMeta.java index d1bac2f74..af07198ea 100644 --- a/src/main/java/net/minestom/server/entity/metadata/minecart/FurnaceMinecartMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/minecart/FurnaceMinecartMeta.java @@ -6,16 +6,16 @@ import org.jetbrains.annotations.NotNull; public class FurnaceMinecartMeta extends AbstractMinecartMeta { - public FurnaceMinecartMeta(@NotNull Entity entity) { - super(entity); + public FurnaceMinecartMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public boolean isHasFuel() { - return getMetadata().getIndex((byte) 13, false); + return super.metadata.getIndex((byte) 13, false); } public void setHasFuel(boolean value) { - getMetadata().setIndex((byte) 13, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 13, Metadata.Boolean(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/minecart/HopperMinecartMeta.java b/src/main/java/net/minestom/server/entity/metadata/minecart/HopperMinecartMeta.java index 88c737395..b35c663da 100644 --- a/src/main/java/net/minestom/server/entity/metadata/minecart/HopperMinecartMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/minecart/HopperMinecartMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata.minecart; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class HopperMinecartMeta extends AbstractMinecartContainerMeta { - public HopperMinecartMeta(@NotNull Entity entity) { - super(entity); + public HopperMinecartMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/minecart/MinecartMeta.java b/src/main/java/net/minestom/server/entity/metadata/minecart/MinecartMeta.java index 5aeb35be2..5b86f0aab 100644 --- a/src/main/java/net/minestom/server/entity/metadata/minecart/MinecartMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/minecart/MinecartMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata.minecart; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class MinecartMeta extends AbstractMinecartMeta { - public MinecartMeta(@NotNull Entity entity) { - super(entity); + public MinecartMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/minecart/SpawnerMinecartMeta.java b/src/main/java/net/minestom/server/entity/metadata/minecart/SpawnerMinecartMeta.java index 7223f4164..b4c4f43c5 100644 --- a/src/main/java/net/minestom/server/entity/metadata/minecart/SpawnerMinecartMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/minecart/SpawnerMinecartMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata.minecart; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class SpawnerMinecartMeta extends AbstractMinecartMeta { - public SpawnerMinecartMeta(@NotNull Entity entity) { - super(entity); + public SpawnerMinecartMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/minecart/TntMinecartMeta.java b/src/main/java/net/minestom/server/entity/metadata/minecart/TntMinecartMeta.java index 2ee5d6824..f66efdcab 100644 --- a/src/main/java/net/minestom/server/entity/metadata/minecart/TntMinecartMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/minecart/TntMinecartMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata.minecart; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class TntMinecartMeta extends AbstractMinecartMeta { - public TntMinecartMeta(@NotNull Entity entity) { - super(entity); + public TntMinecartMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/monster/BasePiglinMeta.java b/src/main/java/net/minestom/server/entity/metadata/monster/BasePiglinMeta.java index 4f392cc2f..b2accacb2 100644 --- a/src/main/java/net/minestom/server/entity/metadata/monster/BasePiglinMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/monster/BasePiglinMeta.java @@ -6,16 +6,16 @@ import org.jetbrains.annotations.NotNull; public class BasePiglinMeta extends MonsterMeta { - protected BasePiglinMeta(@NotNull Entity entity) { - super(entity); + protected BasePiglinMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public boolean isImmuneToZombification() { - return getMetadata().getIndex((byte) 15, false); + return super.metadata.getIndex((byte) 15, false); } public void setImmuneToZombification(boolean value) { - getMetadata().setIndex((byte) 15, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 15, Metadata.Boolean(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/monster/BlazeMeta.java b/src/main/java/net/minestom/server/entity/metadata/monster/BlazeMeta.java index d626640eb..d2004436f 100644 --- a/src/main/java/net/minestom/server/entity/metadata/monster/BlazeMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/monster/BlazeMeta.java @@ -1,6 +1,7 @@ package net.minestom.server.entity.metadata.monster; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class BlazeMeta extends MonsterMeta { @@ -9,8 +10,8 @@ public class BlazeMeta extends MonsterMeta { private final static byte ON_FIRE_BIT = 0x01; - public BlazeMeta(@NotNull Entity entity) { - super(entity); + public BlazeMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public boolean isOnFire() { diff --git a/src/main/java/net/minestom/server/entity/metadata/monster/CaveSpiderMeta.java b/src/main/java/net/minestom/server/entity/metadata/monster/CaveSpiderMeta.java index a22c9e012..f62677c72 100644 --- a/src/main/java/net/minestom/server/entity/metadata/monster/CaveSpiderMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/monster/CaveSpiderMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata.monster; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class CaveSpiderMeta extends SpiderMeta { - public CaveSpiderMeta(@NotNull Entity entity) { - super(entity); + public CaveSpiderMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/monster/CreeperMeta.java b/src/main/java/net/minestom/server/entity/metadata/monster/CreeperMeta.java index c615f0010..582416405 100644 --- a/src/main/java/net/minestom/server/entity/metadata/monster/CreeperMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/monster/CreeperMeta.java @@ -6,34 +6,34 @@ import org.jetbrains.annotations.NotNull; public class CreeperMeta extends MonsterMeta { - public CreeperMeta(@NotNull Entity entity) { - super(entity); + public CreeperMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } @NotNull public State getState() { - int id = getMetadata().getIndex((byte) 15, -1); + int id = super.metadata.getIndex((byte) 15, -1); return id == -1 ? State.IDLE : State.FUSE; } public void setState(@NotNull State value) { - getMetadata().setIndex((byte) 15, Metadata.VarInt(value == State.IDLE ? -1 : 1)); + super.metadata.setIndex((byte) 15, Metadata.VarInt(value == State.IDLE ? -1 : 1)); } public boolean isCharged() { - return getMetadata().getIndex((byte) 16, false); + return super.metadata.getIndex((byte) 16, false); } public void setCharged(boolean value) { - getMetadata().setIndex((byte) 16, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 16, Metadata.Boolean(value)); } public boolean isIgnited() { - return getMetadata().getIndex((byte) 17, false); + return super.metadata.getIndex((byte) 17, false); } public void setIgnited(boolean value) { - getMetadata().setIndex((byte) 17, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 17, Metadata.Boolean(value)); } public enum State { diff --git a/src/main/java/net/minestom/server/entity/metadata/monster/ElderGuardianMeta.java b/src/main/java/net/minestom/server/entity/metadata/monster/ElderGuardianMeta.java index de7be5c13..d08ebc32c 100644 --- a/src/main/java/net/minestom/server/entity/metadata/monster/ElderGuardianMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/monster/ElderGuardianMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata.monster; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class ElderGuardianMeta extends GuardianMeta { - public ElderGuardianMeta(@NotNull Entity entity) { - super(entity); + public ElderGuardianMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/monster/EndermanMeta.java b/src/main/java/net/minestom/server/entity/metadata/monster/EndermanMeta.java index 161b197c5..9856f38ec 100644 --- a/src/main/java/net/minestom/server/entity/metadata/monster/EndermanMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/monster/EndermanMeta.java @@ -7,32 +7,32 @@ import org.jetbrains.annotations.Nullable; public class EndermanMeta extends MonsterMeta { - public EndermanMeta(@NotNull Entity entity) { - super(entity); + public EndermanMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public Integer getCarriedBlockID() { - return getMetadata().getIndex((byte) 15, null); + return super.metadata.getIndex((byte) 15, null); } public void setCarriedBlockID(@Nullable Integer value) { - getMetadata().setIndex((byte) 15, Metadata.OptBlockID(value)); + super.metadata.setIndex((byte) 15, Metadata.OptBlockID(value)); } public boolean isScreaming() { - return getMetadata().getIndex((byte) 16, false); + return super.metadata.getIndex((byte) 16, false); } public void setScreaming(boolean value) { - getMetadata().setIndex((byte) 16, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 16, Metadata.Boolean(value)); } public boolean isStaring() { - return getMetadata().getIndex((byte) 17, false); + return super.metadata.getIndex((byte) 17, false); } public void setStaring(boolean value) { - getMetadata().setIndex((byte) 17, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 17, Metadata.Boolean(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/monster/EndermiteMeta.java b/src/main/java/net/minestom/server/entity/metadata/monster/EndermiteMeta.java index 9669664ac..33850f32b 100644 --- a/src/main/java/net/minestom/server/entity/metadata/monster/EndermiteMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/monster/EndermiteMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata.monster; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class EndermiteMeta extends MonsterMeta { - public EndermiteMeta(@NotNull Entity entity) { - super(entity); + public EndermiteMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/monster/GiantMeta.java b/src/main/java/net/minestom/server/entity/metadata/monster/GiantMeta.java index 2987ddfc2..543a24e64 100644 --- a/src/main/java/net/minestom/server/entity/metadata/monster/GiantMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/monster/GiantMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata.monster; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class GiantMeta extends MonsterMeta { - public GiantMeta(@NotNull Entity entity) { - super(entity); + public GiantMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/monster/GuardianMeta.java b/src/main/java/net/minestom/server/entity/metadata/monster/GuardianMeta.java index 16bcfb73d..410e0f617 100644 --- a/src/main/java/net/minestom/server/entity/metadata/monster/GuardianMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/monster/GuardianMeta.java @@ -8,16 +8,16 @@ public class GuardianMeta extends MonsterMeta { private Entity target; - public GuardianMeta(@NotNull Entity entity) { - super(entity); + public GuardianMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public boolean isRetractingSpikes() { - return getMetadata().getIndex((byte) 15, false); + return super.metadata.getIndex((byte) 15, false); } public void setRetractingSpikes(boolean retractingSpikes) { - getMetadata().setIndex((byte) 15, Metadata.Boolean(retractingSpikes)); + super.metadata.setIndex((byte) 15, Metadata.Boolean(retractingSpikes)); } public Entity getTarget() { @@ -26,7 +26,7 @@ public class GuardianMeta extends MonsterMeta { public void setTarget(@NotNull Entity target) { this.target = target; - getMetadata().setIndex((byte) 16, Metadata.VarInt(target.getEntityId())); + super.metadata.setIndex((byte) 16, Metadata.VarInt(target.getEntityId())); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/monster/MonsterMeta.java b/src/main/java/net/minestom/server/entity/metadata/monster/MonsterMeta.java index 54a3d539e..373ce713e 100644 --- a/src/main/java/net/minestom/server/entity/metadata/monster/MonsterMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/monster/MonsterMeta.java @@ -1,13 +1,14 @@ package net.minestom.server.entity.metadata.monster; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import net.minestom.server.entity.metadata.PathfinderMobMeta; import org.jetbrains.annotations.NotNull; public class MonsterMeta extends PathfinderMobMeta { - protected MonsterMeta(@NotNull Entity entity) { - super(entity); + protected MonsterMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/monster/PiglinBruteMeta.java b/src/main/java/net/minestom/server/entity/metadata/monster/PiglinBruteMeta.java index 5f43cede3..ad3bb28d2 100644 --- a/src/main/java/net/minestom/server/entity/metadata/monster/PiglinBruteMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/monster/PiglinBruteMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata.monster; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class PiglinBruteMeta extends BasePiglinMeta { - public PiglinBruteMeta(@NotNull Entity entity) { - super(entity); + public PiglinBruteMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/monster/PiglinMeta.java b/src/main/java/net/minestom/server/entity/metadata/monster/PiglinMeta.java index ae56a49b0..609b77690 100644 --- a/src/main/java/net/minestom/server/entity/metadata/monster/PiglinMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/monster/PiglinMeta.java @@ -7,12 +7,12 @@ import org.jetbrains.annotations.NotNull; public class PiglinMeta extends BasePiglinMeta { - public PiglinMeta(@NotNull Entity entity) { - super(entity); + public PiglinMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public boolean isBaby() { - return getMetadata().getIndex((byte) 16, false); + return super.metadata.getIndex((byte) 16, false); } public void setBaby(boolean value) { @@ -25,23 +25,23 @@ public class PiglinMeta extends BasePiglinMeta { } else { setBoundingBox(bb.getWidth() * 2, bb.getHeight() * 2); } - getMetadata().setIndex((byte) 16, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 16, Metadata.Boolean(value)); } public boolean isChargingCrossbow() { - return getMetadata().getIndex((byte) 17, false); + return super.metadata.getIndex((byte) 17, false); } public void setChargingCrossbow(boolean value) { - getMetadata().setIndex((byte) 17, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 17, Metadata.Boolean(value)); } public boolean isDancing() { - return getMetadata().getIndex((byte) 18, false); + return super.metadata.getIndex((byte) 18, false); } public void setDancing(boolean value) { - getMetadata().setIndex((byte) 18, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 18, Metadata.Boolean(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/monster/SilverfishMeta.java b/src/main/java/net/minestom/server/entity/metadata/monster/SilverfishMeta.java index 34d33633d..fc9b06439 100644 --- a/src/main/java/net/minestom/server/entity/metadata/monster/SilverfishMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/monster/SilverfishMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata.monster; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class SilverfishMeta extends MonsterMeta { - public SilverfishMeta(@NotNull Entity entity) { - super(entity); + public SilverfishMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/monster/SpiderMeta.java b/src/main/java/net/minestom/server/entity/metadata/monster/SpiderMeta.java index 6c4ef423d..c2183216a 100644 --- a/src/main/java/net/minestom/server/entity/metadata/monster/SpiderMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/monster/SpiderMeta.java @@ -1,6 +1,7 @@ package net.minestom.server.entity.metadata.monster; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class SpiderMeta extends MonsterMeta { @@ -9,8 +10,8 @@ public class SpiderMeta extends MonsterMeta { private final static byte CLIMBING_BIT = 0x01; - public SpiderMeta(@NotNull Entity entity) { - super(entity); + public SpiderMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public boolean isClimbing() { diff --git a/src/main/java/net/minestom/server/entity/metadata/monster/VexMeta.java b/src/main/java/net/minestom/server/entity/metadata/monster/VexMeta.java index 85d7d12ed..7891fa5a6 100644 --- a/src/main/java/net/minestom/server/entity/metadata/monster/VexMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/monster/VexMeta.java @@ -1,6 +1,7 @@ package net.minestom.server.entity.metadata.monster; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class VexMeta extends MonsterMeta { @@ -9,8 +10,8 @@ public class VexMeta extends MonsterMeta { private final static byte ATTACKING_BIT = 0x01; - public VexMeta(@NotNull Entity entity) { - super(entity); + public VexMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public boolean isAttacking() { diff --git a/src/main/java/net/minestom/server/entity/metadata/monster/WitherMeta.java b/src/main/java/net/minestom/server/entity/metadata/monster/WitherMeta.java index 82c5c4be5..959df41c4 100644 --- a/src/main/java/net/minestom/server/entity/metadata/monster/WitherMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/monster/WitherMeta.java @@ -11,8 +11,8 @@ public class WitherMeta extends MonsterMeta { private Entity leftHead; private Entity rightHead; - public WitherMeta(@NotNull Entity entity) { - super(entity); + public WitherMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } @Nullable @@ -22,7 +22,7 @@ public class WitherMeta extends MonsterMeta { public void setCenterHead(@Nullable Entity value) { this.centerHead = value; - getMetadata().setIndex((byte) 15, Metadata.VarInt(value == null ? 0 : value.getEntityId())); + super.metadata.setIndex((byte) 15, Metadata.VarInt(value == null ? 0 : value.getEntityId())); } @Nullable @@ -32,7 +32,7 @@ public class WitherMeta extends MonsterMeta { public void setLeftHead(@Nullable Entity value) { this.leftHead = value; - getMetadata().setIndex((byte) 16, Metadata.VarInt(value == null ? 0 : value.getEntityId())); + super.metadata.setIndex((byte) 16, Metadata.VarInt(value == null ? 0 : value.getEntityId())); } @Nullable @@ -42,15 +42,15 @@ public class WitherMeta extends MonsterMeta { public void setRightHead(@Nullable Entity value) { this.rightHead = value; - getMetadata().setIndex((byte) 17, Metadata.VarInt(value == null ? 0 : value.getEntityId())); + super.metadata.setIndex((byte) 17, Metadata.VarInt(value == null ? 0 : value.getEntityId())); } public int getInvulnerableTime() { - return getMetadata().getIndex((byte) 18, 0); + return super.metadata.getIndex((byte) 18, 0); } public void setInvulnerableTime(int value) { - getMetadata().setIndex((byte) 18, Metadata.VarInt(value)); + super.metadata.setIndex((byte) 18, Metadata.VarInt(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/monster/ZoglinMeta.java b/src/main/java/net/minestom/server/entity/metadata/monster/ZoglinMeta.java index 19582f838..212f60fde 100644 --- a/src/main/java/net/minestom/server/entity/metadata/monster/ZoglinMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/monster/ZoglinMeta.java @@ -7,12 +7,12 @@ import org.jetbrains.annotations.NotNull; public class ZoglinMeta extends MonsterMeta { - public ZoglinMeta(@NotNull Entity entity) { - super(entity); + public ZoglinMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public boolean isBaby() { - return getMetadata().getIndex((byte) 15, false); + return super.metadata.getIndex((byte) 15, false); } public void setBaby(boolean value) { @@ -25,7 +25,7 @@ public class ZoglinMeta extends MonsterMeta { } else { setBoundingBox(bb.getWidth() * 2, bb.getHeight() * 2); } - getMetadata().setIndex((byte) 15, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 15, Metadata.Boolean(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/monster/raider/AbstractIllagerMeta.java b/src/main/java/net/minestom/server/entity/metadata/monster/raider/AbstractIllagerMeta.java index 0fc9afbab..3f137d6d7 100644 --- a/src/main/java/net/minestom/server/entity/metadata/monster/raider/AbstractIllagerMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/monster/raider/AbstractIllagerMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata.monster.raider; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class AbstractIllagerMeta extends RaiderMeta { - protected AbstractIllagerMeta(@NotNull Entity entity) { - super(entity); + protected AbstractIllagerMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/monster/raider/EvokerMeta.java b/src/main/java/net/minestom/server/entity/metadata/monster/raider/EvokerMeta.java index d78c5600c..158dd4fe7 100644 --- a/src/main/java/net/minestom/server/entity/metadata/monster/raider/EvokerMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/monster/raider/EvokerMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata.monster.raider; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class EvokerMeta extends SpellcasterIllagerMeta { - public EvokerMeta(@NotNull Entity entity) { - super(entity); + public EvokerMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/monster/raider/IllusionerMeta.java b/src/main/java/net/minestom/server/entity/metadata/monster/raider/IllusionerMeta.java index acb8a95e6..2e68e9882 100644 --- a/src/main/java/net/minestom/server/entity/metadata/monster/raider/IllusionerMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/monster/raider/IllusionerMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata.monster.raider; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class IllusionerMeta extends SpellcasterIllagerMeta { - public IllusionerMeta(@NotNull Entity entity) { - super(entity); + public IllusionerMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/monster/raider/PillagerMeta.java b/src/main/java/net/minestom/server/entity/metadata/monster/raider/PillagerMeta.java index 1b895834b..ba9c5531f 100644 --- a/src/main/java/net/minestom/server/entity/metadata/monster/raider/PillagerMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/monster/raider/PillagerMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata.monster.raider; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class PillagerMeta extends AbstractIllagerMeta { - public PillagerMeta(@NotNull Entity entity) { - super(entity); + public PillagerMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/monster/raider/RaiderMeta.java b/src/main/java/net/minestom/server/entity/metadata/monster/raider/RaiderMeta.java index 7d9bb30d3..6a0428af7 100644 --- a/src/main/java/net/minestom/server/entity/metadata/monster/raider/RaiderMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/monster/raider/RaiderMeta.java @@ -7,16 +7,16 @@ import org.jetbrains.annotations.NotNull; public class RaiderMeta extends MonsterMeta { - protected RaiderMeta(@NotNull Entity entity) { - super(entity); + protected RaiderMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public boolean isCelebrating() { - return getMetadata().getIndex((byte) 15, false); + return super.metadata.getIndex((byte) 15, false); } public void setCelebrating(boolean value) { - getMetadata().setIndex((byte) 15, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 15, Metadata.Boolean(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/monster/raider/RavagerMeta.java b/src/main/java/net/minestom/server/entity/metadata/monster/raider/RavagerMeta.java index 73f7c1ca8..cd7c08516 100644 --- a/src/main/java/net/minestom/server/entity/metadata/monster/raider/RavagerMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/monster/raider/RavagerMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata.monster.raider; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class RavagerMeta extends RaiderMeta { - public RavagerMeta(@NotNull Entity entity) { - super(entity); + public RavagerMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/monster/raider/SpellcasterIllagerMeta.java b/src/main/java/net/minestom/server/entity/metadata/monster/raider/SpellcasterIllagerMeta.java index e2dd97377..0fe9a1f68 100644 --- a/src/main/java/net/minestom/server/entity/metadata/monster/raider/SpellcasterIllagerMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/monster/raider/SpellcasterIllagerMeta.java @@ -6,17 +6,17 @@ import org.jetbrains.annotations.NotNull; public class SpellcasterIllagerMeta extends AbstractIllagerMeta { - protected SpellcasterIllagerMeta(@NotNull Entity entity) { - super(entity); + protected SpellcasterIllagerMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } @NotNull public Spell getSpell() { - return Spell.VALUES[getMetadata().getIndex((byte) 16, (byte) 0)]; + return Spell.VALUES[super.metadata.getIndex((byte) 16, (byte) 0)]; } public void setSpell(@NotNull Spell spell) { - getMetadata().setIndex((byte) 16, Metadata.Byte((byte) spell.ordinal())); + super.metadata.setIndex((byte) 16, Metadata.Byte((byte) spell.ordinal())); } public enum Spell { diff --git a/src/main/java/net/minestom/server/entity/metadata/monster/raider/VindicatorMeta.java b/src/main/java/net/minestom/server/entity/metadata/monster/raider/VindicatorMeta.java index cc26e51e9..76d25086d 100644 --- a/src/main/java/net/minestom/server/entity/metadata/monster/raider/VindicatorMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/monster/raider/VindicatorMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata.monster.raider; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class VindicatorMeta extends AbstractIllagerMeta { - public VindicatorMeta(@NotNull Entity entity) { - super(entity); + public VindicatorMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/monster/raider/WitchMeta.java b/src/main/java/net/minestom/server/entity/metadata/monster/raider/WitchMeta.java index 0a162d717..3454caff6 100644 --- a/src/main/java/net/minestom/server/entity/metadata/monster/raider/WitchMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/monster/raider/WitchMeta.java @@ -6,16 +6,16 @@ import org.jetbrains.annotations.NotNull; public class WitchMeta extends RaiderMeta { - public WitchMeta(@NotNull Entity entity) { - super(entity); + public WitchMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public boolean isDrinkingPotion() { - return getMetadata().getIndex((byte) 16, false); + return super.metadata.getIndex((byte) 16, false); } public void setDrinkingPotion(boolean value) { - getMetadata().setIndex((byte) 16, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 16, Metadata.Boolean(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/monster/skeleton/AbstractSkeletonMeta.java b/src/main/java/net/minestom/server/entity/metadata/monster/skeleton/AbstractSkeletonMeta.java index c4f63abb6..053f63547 100644 --- a/src/main/java/net/minestom/server/entity/metadata/monster/skeleton/AbstractSkeletonMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/monster/skeleton/AbstractSkeletonMeta.java @@ -1,13 +1,14 @@ package net.minestom.server.entity.metadata.monster.skeleton; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import net.minestom.server.entity.metadata.monster.MonsterMeta; import org.jetbrains.annotations.NotNull; public class AbstractSkeletonMeta extends MonsterMeta { - protected AbstractSkeletonMeta(@NotNull Entity entity) { - super(entity); + protected AbstractSkeletonMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/monster/skeleton/SkeletonMeta.java b/src/main/java/net/minestom/server/entity/metadata/monster/skeleton/SkeletonMeta.java index 75999418e..e0abb8643 100644 --- a/src/main/java/net/minestom/server/entity/metadata/monster/skeleton/SkeletonMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/monster/skeleton/SkeletonMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata.monster.skeleton; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class SkeletonMeta extends AbstractSkeletonMeta { - public SkeletonMeta(@NotNull Entity entity) { - super(entity); + public SkeletonMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/monster/skeleton/StrayMeta.java b/src/main/java/net/minestom/server/entity/metadata/monster/skeleton/StrayMeta.java index 2f9685896..261079ab8 100644 --- a/src/main/java/net/minestom/server/entity/metadata/monster/skeleton/StrayMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/monster/skeleton/StrayMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata.monster.skeleton; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class StrayMeta extends AbstractSkeletonMeta { - public StrayMeta(@NotNull Entity entity) { - super(entity); + public StrayMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/monster/skeleton/WitherSkeletonMeta.java b/src/main/java/net/minestom/server/entity/metadata/monster/skeleton/WitherSkeletonMeta.java index f764d3947..4f9f83317 100644 --- a/src/main/java/net/minestom/server/entity/metadata/monster/skeleton/WitherSkeletonMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/monster/skeleton/WitherSkeletonMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata.monster.skeleton; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class WitherSkeletonMeta extends AbstractSkeletonMeta { - public WitherSkeletonMeta(@NotNull Entity entity) { - super(entity); + public WitherSkeletonMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/monster/zombie/DrownedMeta.java b/src/main/java/net/minestom/server/entity/metadata/monster/zombie/DrownedMeta.java index c1acdac45..a6101e304 100644 --- a/src/main/java/net/minestom/server/entity/metadata/monster/zombie/DrownedMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/monster/zombie/DrownedMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata.monster.zombie; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class DrownedMeta extends ZombieMeta { - public DrownedMeta(@NotNull Entity entity) { - super(entity); + public DrownedMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/monster/zombie/HuskMeta.java b/src/main/java/net/minestom/server/entity/metadata/monster/zombie/HuskMeta.java index de3e98b91..4f530a8a7 100644 --- a/src/main/java/net/minestom/server/entity/metadata/monster/zombie/HuskMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/monster/zombie/HuskMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata.monster.zombie; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class HuskMeta extends ZombieMeta { - public HuskMeta(@NotNull Entity entity) { - super(entity); + public HuskMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/monster/zombie/ZombieMeta.java b/src/main/java/net/minestom/server/entity/metadata/monster/zombie/ZombieMeta.java index aa80f9144..218fc0449 100644 --- a/src/main/java/net/minestom/server/entity/metadata/monster/zombie/ZombieMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/monster/zombie/ZombieMeta.java @@ -8,12 +8,12 @@ import org.jetbrains.annotations.NotNull; public class ZombieMeta extends MonsterMeta { - public ZombieMeta(@NotNull Entity entity) { - super(entity); + public ZombieMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public boolean isBaby() { - return getMetadata().getIndex((byte) 15, false); + return super.metadata.getIndex((byte) 15, false); } public void setBaby(boolean value) { @@ -26,15 +26,15 @@ public class ZombieMeta extends MonsterMeta { } else { setBoundingBox(bb.getWidth() * 2, bb.getHeight() * 2); } - getMetadata().setIndex((byte) 15, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 15, Metadata.Boolean(value)); } public boolean isBecomingDrowned() { - return getMetadata().getIndex((byte) 17, false); + return super.metadata.getIndex((byte) 17, false); } public void setBecomingDrowned(boolean value) { - getMetadata().setIndex((byte) 17, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 17, Metadata.Boolean(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/monster/zombie/ZombieVillagerMeta.java b/src/main/java/net/minestom/server/entity/metadata/monster/zombie/ZombieVillagerMeta.java index 963eb0d89..5d5072d45 100644 --- a/src/main/java/net/minestom/server/entity/metadata/monster/zombie/ZombieVillagerMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/monster/zombie/ZombieVillagerMeta.java @@ -7,20 +7,20 @@ import org.jetbrains.annotations.NotNull; public class ZombieVillagerMeta extends ZombieMeta { - public ZombieVillagerMeta(@NotNull Entity entity) { - super(entity); + public ZombieVillagerMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public boolean isConverting() { - return getMetadata().getIndex((byte) 18, false); + return super.metadata.getIndex((byte) 18, false); } public void setConverting(boolean value) { - getMetadata().setIndex((byte) 18, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 18, Metadata.Boolean(value)); } public VillagerMeta.VillagerData getVillagerData() { - int[] data = getMetadata().getIndex((byte) 17, null); + int[] data = super.metadata.getIndex((byte) 17, null); if (data == null) { return new VillagerMeta.VillagerData(VillagerMeta.Type.PLAINS, VillagerMeta.Profession.NONE, VillagerMeta.Level.NOVICE); } @@ -28,7 +28,7 @@ public class ZombieVillagerMeta extends ZombieMeta { } public void setVillagerData(VillagerMeta.VillagerData data) { - getMetadata().setIndex((byte) 17, Metadata.VillagerData( + super.metadata.setIndex((byte) 17, Metadata.VillagerData( data.getType().ordinal(), data.getProfession().ordinal(), data.getLevel().ordinal() + 1 diff --git a/src/main/java/net/minestom/server/entity/metadata/monster/zombie/ZombifiedPiglinMeta.java b/src/main/java/net/minestom/server/entity/metadata/monster/zombie/ZombifiedPiglinMeta.java index b408f56b7..775de78c6 100644 --- a/src/main/java/net/minestom/server/entity/metadata/monster/zombie/ZombifiedPiglinMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/monster/zombie/ZombifiedPiglinMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata.monster.zombie; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class ZombifiedPiglinMeta extends ZombieMeta { - public ZombifiedPiglinMeta(@NotNull Entity entity) { - super(entity); + public ZombifiedPiglinMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/object/EyeOfEnderMeta.java b/src/main/java/net/minestom/server/entity/metadata/object/EyeOfEnderMeta.java index b1b222b41..9635201c0 100644 --- a/src/main/java/net/minestom/server/entity/metadata/object/EyeOfEnderMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/object/EyeOfEnderMeta.java @@ -1,13 +1,14 @@ package net.minestom.server.entity.metadata.object; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import net.minestom.server.item.Material; import org.jetbrains.annotations.NotNull; public class EyeOfEnderMeta extends ObjectEntityMeta { - public EyeOfEnderMeta(@NotNull Entity entity) { - super(entity, Material.ENDER_EYE); + public EyeOfEnderMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata, Material.ENDER_EYE); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/object/FireballMeta.java b/src/main/java/net/minestom/server/entity/metadata/object/FireballMeta.java index 297ceea18..062691eb2 100644 --- a/src/main/java/net/minestom/server/entity/metadata/object/FireballMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/object/FireballMeta.java @@ -1,13 +1,14 @@ package net.minestom.server.entity.metadata.object; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import net.minestom.server.item.Material; import org.jetbrains.annotations.NotNull; public class FireballMeta extends ObjectEntityMeta { - public FireballMeta(@NotNull Entity entity) { - super(entity, Material.AIR); + public FireballMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata, Material.AIR); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/object/ItemEntityMeta.java b/src/main/java/net/minestom/server/entity/metadata/object/ItemEntityMeta.java index e3e659e2f..32b43ff0a 100644 --- a/src/main/java/net/minestom/server/entity/metadata/object/ItemEntityMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/object/ItemEntityMeta.java @@ -1,13 +1,14 @@ package net.minestom.server.entity.metadata.object; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import net.minestom.server.item.Material; import org.jetbrains.annotations.NotNull; public class ItemEntityMeta extends ObjectEntityMeta { - public ItemEntityMeta(@NotNull Entity entity) { - super(entity, Material.AIR); + public ItemEntityMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata, Material.AIR); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/object/ObjectEntityMeta.java b/src/main/java/net/minestom/server/entity/metadata/object/ObjectEntityMeta.java index 16a46be39..e952e66a3 100644 --- a/src/main/java/net/minestom/server/entity/metadata/object/ObjectEntityMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/object/ObjectEntityMeta.java @@ -11,18 +11,18 @@ public class ObjectEntityMeta extends BaseEntityMeta { private final ItemStack defaultItem; - protected ObjectEntityMeta(@NotNull Entity entity, @NotNull Material defaultItemMaterial) { - super(entity); + protected ObjectEntityMeta(@NotNull Entity entity, @NotNull Metadata metadata, @NotNull Material defaultItemMaterial) { + super(entity, metadata); this.defaultItem = new ItemStack(defaultItemMaterial, (byte) 1); } @NotNull public ItemStack getItem() { - return getMetadata().getIndex((byte) 7, this.defaultItem); + return super.metadata.getIndex((byte) 7, this.defaultItem); } public void setItem(@NotNull ItemStack item) { - getMetadata().setIndex((byte) 7, Metadata.Slot(item)); + super.metadata.setIndex((byte) 7, Metadata.Slot(item)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/object/SmallFireballMeta.java b/src/main/java/net/minestom/server/entity/metadata/object/SmallFireballMeta.java index 442911e6d..4f95791ac 100644 --- a/src/main/java/net/minestom/server/entity/metadata/object/SmallFireballMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/object/SmallFireballMeta.java @@ -1,13 +1,14 @@ package net.minestom.server.entity.metadata.object; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import net.minestom.server.item.Material; import org.jetbrains.annotations.NotNull; public class SmallFireballMeta extends ObjectEntityMeta { - public SmallFireballMeta(@NotNull Entity entity) { - super(entity, Material.FIRE_CHARGE); + public SmallFireballMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata, Material.FIRE_CHARGE); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/object/SnowballMeta.java b/src/main/java/net/minestom/server/entity/metadata/object/SnowballMeta.java index de6d3c7a1..6409f3ab9 100644 --- a/src/main/java/net/minestom/server/entity/metadata/object/SnowballMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/object/SnowballMeta.java @@ -1,13 +1,14 @@ package net.minestom.server.entity.metadata.object; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import net.minestom.server.item.Material; import org.jetbrains.annotations.NotNull; public class SnowballMeta extends ObjectEntityMeta { - public SnowballMeta(@NotNull Entity entity) { - super(entity, Material.SNOWBALL); + public SnowballMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata, Material.SNOWBALL); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/object/ThrownEggMeta.java b/src/main/java/net/minestom/server/entity/metadata/object/ThrownEggMeta.java index cb8b5065f..8c840f922 100644 --- a/src/main/java/net/minestom/server/entity/metadata/object/ThrownEggMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/object/ThrownEggMeta.java @@ -1,13 +1,14 @@ package net.minestom.server.entity.metadata.object; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import net.minestom.server.item.Material; import org.jetbrains.annotations.NotNull; public class ThrownEggMeta extends ObjectEntityMeta { - public ThrownEggMeta(@NotNull Entity entity) { - super(entity, Material.EGG); + public ThrownEggMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata, Material.EGG); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/object/ThrownEnderPearlMeta.java b/src/main/java/net/minestom/server/entity/metadata/object/ThrownEnderPearlMeta.java index 6e202bf4e..22de9c6f3 100644 --- a/src/main/java/net/minestom/server/entity/metadata/object/ThrownEnderPearlMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/object/ThrownEnderPearlMeta.java @@ -1,13 +1,14 @@ package net.minestom.server.entity.metadata.object; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import net.minestom.server.item.Material; import org.jetbrains.annotations.NotNull; public class ThrownEnderPearlMeta extends ObjectEntityMeta { - public ThrownEnderPearlMeta(@NotNull Entity entity) { - super(entity, Material.ENDER_PEARL); + public ThrownEnderPearlMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata, Material.ENDER_PEARL); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/object/ThrownExperienceBottleMeta.java b/src/main/java/net/minestom/server/entity/metadata/object/ThrownExperienceBottleMeta.java index 4be269dea..4cb5a9903 100644 --- a/src/main/java/net/minestom/server/entity/metadata/object/ThrownExperienceBottleMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/object/ThrownExperienceBottleMeta.java @@ -1,13 +1,14 @@ package net.minestom.server.entity.metadata.object; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import net.minestom.server.item.Material; import org.jetbrains.annotations.NotNull; public class ThrownExperienceBottleMeta extends ObjectEntityMeta { - public ThrownExperienceBottleMeta(@NotNull Entity entity) { - super(entity, Material.EXPERIENCE_BOTTLE); + public ThrownExperienceBottleMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata, Material.EXPERIENCE_BOTTLE); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/object/ThrownPotionMeta.java b/src/main/java/net/minestom/server/entity/metadata/object/ThrownPotionMeta.java index 455c3a588..f7779fa34 100644 --- a/src/main/java/net/minestom/server/entity/metadata/object/ThrownPotionMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/object/ThrownPotionMeta.java @@ -1,13 +1,14 @@ package net.minestom.server.entity.metadata.object; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import net.minestom.server.item.Material; import org.jetbrains.annotations.NotNull; public class ThrownPotionMeta extends ObjectEntityMeta { - public ThrownPotionMeta(@NotNull Entity entity) { - super(entity, Material.AIR); + public ThrownPotionMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata, Material.AIR); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/other/AreaEffectCloudMeta.java b/src/main/java/net/minestom/server/entity/metadata/other/AreaEffectCloudMeta.java index 2099f5820..f4f3b5575 100644 --- a/src/main/java/net/minestom/server/entity/metadata/other/AreaEffectCloudMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/other/AreaEffectCloudMeta.java @@ -9,40 +9,40 @@ import org.jetbrains.annotations.NotNull; public class AreaEffectCloudMeta extends BaseEntityMeta { - public AreaEffectCloudMeta(@NotNull Entity entity) { - super(entity); + public AreaEffectCloudMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public float getRadius() { - return getMetadata().getIndex((byte) 7, .5F); + return super.metadata.getIndex((byte) 7, .5F); } public void setRadius(float value) { - getMetadata().setIndex((byte) 7, Metadata.Float(value)); + super.metadata.setIndex((byte) 7, Metadata.Float(value)); } public int getColor() { - return getMetadata().getIndex((byte) 8, 0); + return super.metadata.getIndex((byte) 8, 0); } public void setColor(int value) { - getMetadata().setIndex((byte) 8, Metadata.VarInt(value)); + super.metadata.setIndex((byte) 8, Metadata.VarInt(value)); } public boolean isSinglePoint() { - return getMetadata().getIndex((byte) 9, false); + return super.metadata.getIndex((byte) 9, false); } public void setSinglePoint(boolean value) { - getMetadata().setIndex((byte) 9, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 9, Metadata.Boolean(value)); } public Particle getParticle() { - return getMetadata().getIndex((byte) 10, new Particle(ParticleType.EFFECT, null)); + return super.metadata.getIndex((byte) 10, new Particle(ParticleType.EFFECT, null)); } public void setParticle(Particle value) { - getMetadata().setIndex((byte) 11, Metadata.Particle(value)); + super.metadata.setIndex((byte) 11, Metadata.Particle(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/other/ArmorStandMeta.java b/src/main/java/net/minestom/server/entity/metadata/other/ArmorStandMeta.java index a4a7a208f..ae7d8a6b0 100644 --- a/src/main/java/net/minestom/server/entity/metadata/other/ArmorStandMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/other/ArmorStandMeta.java @@ -3,7 +3,6 @@ package net.minestom.server.entity.metadata.other; import net.minestom.server.entity.Entity; import net.minestom.server.entity.Metadata; import net.minestom.server.entity.metadata.LivingEntityMeta; -import net.minestom.server.utils.Rotation; import net.minestom.server.utils.Vector; import org.jetbrains.annotations.NotNull; @@ -16,8 +15,8 @@ public class ArmorStandMeta extends LivingEntityMeta { private final static byte HAS_NO_BASE_PLATE_BIT = 0x08; private final static byte IS_MARKER_BIT = 0x10; - public ArmorStandMeta(@NotNull Entity entity) { - super(entity); + public ArmorStandMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public boolean isSmall() { @@ -54,56 +53,56 @@ public class ArmorStandMeta extends LivingEntityMeta { @NotNull public Vector getHeadRotation() { - return getMetadata().getIndex((byte) 15, new Vector(0D, 0D, 0D)); + return super.metadata.getIndex((byte) 15, new Vector(0D, 0D, 0D)); } public void setHeadRotation(@NotNull Vector value) { - getMetadata().setIndex((byte) 15, Metadata.Rotation(value)); + super.metadata.setIndex((byte) 15, Metadata.Rotation(value)); } @NotNull public Vector getBodyRotation() { - return getMetadata().getIndex((byte) 16, new Vector(0D, 0D, 0D)); + return super.metadata.getIndex((byte) 16, new Vector(0D, 0D, 0D)); } public void setBodyRotation(@NotNull Vector value) { - getMetadata().setIndex((byte) 16, Metadata.Rotation(value)); + super.metadata.setIndex((byte) 16, Metadata.Rotation(value)); } @NotNull public Vector getLeftArmRotation() { - return getMetadata().getIndex((byte) 17, new Vector(-10D, 0D, -10D)); + return super.metadata.getIndex((byte) 17, new Vector(-10D, 0D, -10D)); } public void setLeftArmRotation(@NotNull Vector value) { - getMetadata().setIndex((byte) 17, Metadata.Rotation(value)); + super.metadata.setIndex((byte) 17, Metadata.Rotation(value)); } @NotNull public Vector getRightArmRotation() { - return getMetadata().getIndex((byte) 18, new Vector(-15D, 0D, 10D)); + return super.metadata.getIndex((byte) 18, new Vector(-15D, 0D, 10D)); } public void setRightArmRotation(@NotNull Vector value) { - getMetadata().setIndex((byte) 18, Metadata.Rotation(value)); + super.metadata.setIndex((byte) 18, Metadata.Rotation(value)); } @NotNull public Vector getLeftLegRotation() { - return getMetadata().getIndex((byte) 19, new Vector(-1D, 0D, -1D)); + return super.metadata.getIndex((byte) 19, new Vector(-1D, 0D, -1D)); } public void setLeftLegRotation(@NotNull Vector value) { - getMetadata().setIndex((byte) 19, Metadata.Rotation(value)); + super.metadata.setIndex((byte) 19, Metadata.Rotation(value)); } @NotNull public Vector getRightLegRotation() { - return getMetadata().getIndex((byte) 20, new Vector(1D, 0D, 1D)); + return super.metadata.getIndex((byte) 20, new Vector(1D, 0D, 1D)); } public void setRightLegRotation(@NotNull Vector value) { - getMetadata().setIndex((byte) 20, Metadata.Rotation(value)); + super.metadata.setIndex((byte) 20, Metadata.Rotation(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/other/BoatMeta.java b/src/main/java/net/minestom/server/entity/metadata/other/BoatMeta.java index edb99704e..f7c10fdfa 100644 --- a/src/main/java/net/minestom/server/entity/metadata/other/BoatMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/other/BoatMeta.java @@ -7,65 +7,65 @@ import org.jetbrains.annotations.NotNull; public class BoatMeta extends BaseEntityMeta { - public BoatMeta(@NotNull Entity entity) { - super(entity); + public BoatMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public int getTimeSinceLastHit() { - return getMetadata().getIndex((byte) 7, 0); + return super.metadata.getIndex((byte) 7, 0); } public void setTimeSinceLastHit(int value) { - getMetadata().setIndex((byte) 7, Metadata.VarInt(value)); + super.metadata.setIndex((byte) 7, Metadata.VarInt(value)); } public int getForwardDirection() { - return getMetadata().getIndex((byte) 8, 1); + return super.metadata.getIndex((byte) 8, 1); } public void setForwardDirection(int value) { - getMetadata().setIndex((byte) 8, Metadata.VarInt(value)); + super.metadata.setIndex((byte) 8, Metadata.VarInt(value)); } public float getDamageTaken() { - return getMetadata().getIndex((byte) 9, 0); + return super.metadata.getIndex((byte) 9, 0); } public void setDamageTaken(float value) { - getMetadata().setIndex((byte) 9, Metadata.Float(value)); + super.metadata.setIndex((byte) 9, Metadata.Float(value)); } @NotNull public Type getType() { - return Type.VALUES[getMetadata().getIndex((byte) 10, 0)]; + return Type.VALUES[super.metadata.getIndex((byte) 10, 0)]; } public void setType(@NotNull Type value) { - getMetadata().setIndex((byte) 10, Metadata.VarInt(value.ordinal())); + super.metadata.setIndex((byte) 10, Metadata.VarInt(value.ordinal())); } public boolean isLeftPaddleTurning() { - return getMetadata().getIndex((byte) 11, false); + return super.metadata.getIndex((byte) 11, false); } public void setLeftPaddleTurning(boolean value) { - getMetadata().setIndex((byte) 11, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 11, Metadata.Boolean(value)); } public boolean isRightPaddleTurning() { - return getMetadata().getIndex((byte) 12, false); + return super.metadata.getIndex((byte) 12, false); } public void setRightPaddleTurning(boolean value) { - getMetadata().setIndex((byte) 12, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 12, Metadata.Boolean(value)); } public int getSplashTimer() { - return getMetadata().getIndex((byte) 13, 0); + return super.metadata.getIndex((byte) 13, 0); } public void setSplashTimer(int value) { - getMetadata().setIndex((byte) 13, Metadata.VarInt(value)); + super.metadata.setIndex((byte) 13, Metadata.VarInt(value)); } public enum Type { diff --git a/src/main/java/net/minestom/server/entity/metadata/other/DragonFireballMeta.java b/src/main/java/net/minestom/server/entity/metadata/other/DragonFireballMeta.java index aab16735c..9de75948f 100644 --- a/src/main/java/net/minestom/server/entity/metadata/other/DragonFireballMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/other/DragonFireballMeta.java @@ -1,13 +1,14 @@ package net.minestom.server.entity.metadata.other; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import net.minestom.server.entity.metadata.BaseEntityMeta; import org.jetbrains.annotations.NotNull; public class DragonFireballMeta extends BaseEntityMeta { - public DragonFireballMeta(@NotNull Entity entity) { - super(entity); + public DragonFireballMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/other/EndCrystalMeta.java b/src/main/java/net/minestom/server/entity/metadata/other/EndCrystalMeta.java index 5fbab3e64..262c08730 100644 --- a/src/main/java/net/minestom/server/entity/metadata/other/EndCrystalMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/other/EndCrystalMeta.java @@ -9,25 +9,25 @@ import org.jetbrains.annotations.Nullable; public class EndCrystalMeta extends BaseEntityMeta { - public EndCrystalMeta(@NotNull Entity entity) { - super(entity); + public EndCrystalMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } @Nullable public BlockPosition getBeamTarget() { - return getMetadata().getIndex((byte) 7, null); + return super.metadata.getIndex((byte) 7, null); } public void setBeamTarget(@Nullable BlockPosition value) { - getMetadata().setIndex((byte) 7, Metadata.OptPosition(value)); + super.metadata.setIndex((byte) 7, Metadata.OptPosition(value)); } public boolean isShowingBottom() { - return getMetadata().getIndex((byte) 8, true); + return super.metadata.getIndex((byte) 8, true); } public void setShowingBottom(boolean value) { - getMetadata().setIndex((byte) 8, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 8, Metadata.Boolean(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/other/EnderDragonMeta.java b/src/main/java/net/minestom/server/entity/metadata/other/EnderDragonMeta.java index b0953b369..fa1d6f308 100644 --- a/src/main/java/net/minestom/server/entity/metadata/other/EnderDragonMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/other/EnderDragonMeta.java @@ -7,17 +7,17 @@ import org.jetbrains.annotations.NotNull; public class EnderDragonMeta extends MobMeta { - public EnderDragonMeta(@NotNull Entity entity) { - super(entity); + public EnderDragonMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } @NotNull public Phase getPhase() { - return Phase.VALUES[getMetadata().getIndex((byte) 15, 0)]; + return Phase.VALUES[super.metadata.getIndex((byte) 15, 0)]; } public void setPhase(@NotNull Phase value) { - getMetadata().getIndex((byte) 15, Metadata.VarInt(value.ordinal())); + super.metadata.getIndex((byte) 15, Metadata.VarInt(value.ordinal())); } public enum Phase { diff --git a/src/main/java/net/minestom/server/entity/metadata/other/EvokerFangsMeta.java b/src/main/java/net/minestom/server/entity/metadata/other/EvokerFangsMeta.java index 23f5c8cb3..9c8d645ce 100644 --- a/src/main/java/net/minestom/server/entity/metadata/other/EvokerFangsMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/other/EvokerFangsMeta.java @@ -1,13 +1,14 @@ package net.minestom.server.entity.metadata.other; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import net.minestom.server.entity.metadata.BaseEntityMeta; import org.jetbrains.annotations.NotNull; public class EvokerFangsMeta extends BaseEntityMeta { - public EvokerFangsMeta(@NotNull Entity entity) { - super(entity); + public EvokerFangsMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/other/ExperienceOrbMeta.java b/src/main/java/net/minestom/server/entity/metadata/other/ExperienceOrbMeta.java index 480392e96..dc2107a15 100644 --- a/src/main/java/net/minestom/server/entity/metadata/other/ExperienceOrbMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/other/ExperienceOrbMeta.java @@ -1,13 +1,14 @@ package net.minestom.server.entity.metadata.other; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import net.minestom.server.entity.metadata.EntityMeta; import org.jetbrains.annotations.NotNull; public class ExperienceOrbMeta extends EntityMeta { - public ExperienceOrbMeta(@NotNull Entity entity) { - super(entity); + public ExperienceOrbMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/other/FallingBlockMeta.java b/src/main/java/net/minestom/server/entity/metadata/other/FallingBlockMeta.java index 1c87f2e02..098216492 100644 --- a/src/main/java/net/minestom/server/entity/metadata/other/FallingBlockMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/other/FallingBlockMeta.java @@ -8,16 +8,16 @@ import org.jetbrains.annotations.NotNull; public class FallingBlockMeta extends BaseEntityMeta { - public FallingBlockMeta(@NotNull Entity entity) { - super(entity); + public FallingBlockMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public BlockPosition getSpawnPosition() { - return getMetadata().getIndex((byte) 7, new BlockPosition(0, 0, 0)); + return super.metadata.getIndex((byte) 7, new BlockPosition(0, 0, 0)); } public void setSpawnPosition(BlockPosition value) { - getMetadata().setIndex((byte) 7, Metadata.Position(value)); + super.metadata.setIndex((byte) 7, Metadata.Position(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/other/FireworkRocketMeta.java b/src/main/java/net/minestom/server/entity/metadata/other/FireworkRocketMeta.java index 9d1d7d46c..303b0fe76 100644 --- a/src/main/java/net/minestom/server/entity/metadata/other/FireworkRocketMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/other/FireworkRocketMeta.java @@ -11,17 +11,17 @@ public class FireworkRocketMeta extends BaseEntityMeta { private Entity shooter; - public FireworkRocketMeta(@NotNull Entity entity) { - super(entity); + public FireworkRocketMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } @NotNull public ItemStack getFireworkInfo() { - return getMetadata().getIndex((byte) 7, ItemStack.getAirItem()); + return super.metadata.getIndex((byte) 7, ItemStack.getAirItem()); } public void setFireworkInfo(@NotNull ItemStack value) { - getMetadata().setIndex((byte) 7, Metadata.Slot(value)); + super.metadata.setIndex((byte) 7, Metadata.Slot(value)); } @Nullable @@ -32,15 +32,15 @@ public class FireworkRocketMeta extends BaseEntityMeta { public void setShooter(@Nullable Entity value) { this.shooter = value; Integer entityID = value == null ? null : value.getEntityId(); - getMetadata().setIndex((byte) 8, Metadata.OptVarInt(entityID)); + super.metadata.setIndex((byte) 8, Metadata.OptVarInt(entityID)); } public boolean isShotAtAngle() { - return getMetadata().getIndex((byte) 9, false); + return super.metadata.getIndex((byte) 9, false); } public void setShotAtAngle(boolean value) { - getMetadata().setIndex((byte) 9, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 9, Metadata.Boolean(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/other/FishingHookMeta.java b/src/main/java/net/minestom/server/entity/metadata/other/FishingHookMeta.java index 4f66c5a12..d8d34d7be 100644 --- a/src/main/java/net/minestom/server/entity/metadata/other/FishingHookMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/other/FishingHookMeta.java @@ -10,8 +10,8 @@ public class FishingHookMeta extends BaseEntityMeta { private Entity hooked; - public FishingHookMeta(@NotNull Entity entity) { - super(entity); + public FishingHookMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } @Nullable @@ -22,15 +22,15 @@ public class FishingHookMeta extends BaseEntityMeta { public void setHookedEntity(@Nullable Entity value) { this.hooked = value; int entityID = value == null ? 0 : value.getEntityId() + 1; - getMetadata().setIndex((byte) 7, Metadata.VarInt(entityID)); + super.metadata.setIndex((byte) 7, Metadata.VarInt(entityID)); } public boolean isCatchable() { - return getMetadata().getIndex((byte) 8, false); + return super.metadata.getIndex((byte) 8, false); } public void setCatchable(boolean value) { - getMetadata().setIndex((byte) 8, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 8, Metadata.Boolean(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/other/ItemFrameMeta.java b/src/main/java/net/minestom/server/entity/metadata/other/ItemFrameMeta.java index 5ef5a11a7..007ae1b68 100644 --- a/src/main/java/net/minestom/server/entity/metadata/other/ItemFrameMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/other/ItemFrameMeta.java @@ -8,25 +8,25 @@ import org.jetbrains.annotations.NotNull; public class ItemFrameMeta extends BaseEntityMeta { - public ItemFrameMeta(@NotNull Entity entity) { - super(entity); + public ItemFrameMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } @NotNull public ItemStack getItem() { - return getMetadata().getIndex((byte) 7, ItemStack.getAirItem()); + return super.metadata.getIndex((byte) 7, ItemStack.getAirItem()); } public void setItem(@NotNull ItemStack value) { - getMetadata().setIndex((byte) 7, Metadata.Slot(value)); + super.metadata.setIndex((byte) 7, Metadata.Slot(value)); } public int getRotation() { - return getMetadata().getIndex((byte) 8, 0); + return super.metadata.getIndex((byte) 8, 0); } public void setRotation(int value) { - getMetadata().setIndex((byte) 8, Metadata.VarInt(value)); + super.metadata.setIndex((byte) 8, Metadata.VarInt(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/other/LeashKnotMeta.java b/src/main/java/net/minestom/server/entity/metadata/other/LeashKnotMeta.java index aab1c21d8..0d5c3e753 100644 --- a/src/main/java/net/minestom/server/entity/metadata/other/LeashKnotMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/other/LeashKnotMeta.java @@ -1,13 +1,14 @@ package net.minestom.server.entity.metadata.other; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import net.minestom.server.entity.metadata.EntityMeta; import org.jetbrains.annotations.NotNull; public class LeashKnotMeta extends EntityMeta { - public LeashKnotMeta(@NotNull Entity entity) { - super(entity); + public LeashKnotMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/other/LightningBoltMeta.java b/src/main/java/net/minestom/server/entity/metadata/other/LightningBoltMeta.java index a5c9f8734..ab3522e30 100644 --- a/src/main/java/net/minestom/server/entity/metadata/other/LightningBoltMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/other/LightningBoltMeta.java @@ -1,13 +1,14 @@ package net.minestom.server.entity.metadata.other; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import net.minestom.server.entity.metadata.EntityMeta; import org.jetbrains.annotations.NotNull; public class LightningBoltMeta extends EntityMeta { - public LightningBoltMeta(@NotNull Entity entity) { - super(entity); + public LightningBoltMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/other/LlamaSpitMeta.java b/src/main/java/net/minestom/server/entity/metadata/other/LlamaSpitMeta.java index e4090a308..258b5d38b 100644 --- a/src/main/java/net/minestom/server/entity/metadata/other/LlamaSpitMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/other/LlamaSpitMeta.java @@ -1,13 +1,14 @@ package net.minestom.server.entity.metadata.other; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import net.minestom.server.entity.metadata.BaseEntityMeta; import org.jetbrains.annotations.NotNull; public class LlamaSpitMeta extends BaseEntityMeta { - public LlamaSpitMeta(@NotNull Entity entity) { - super(entity); + public LlamaSpitMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/other/MagmaCubeMeta.java b/src/main/java/net/minestom/server/entity/metadata/other/MagmaCubeMeta.java index f22c1d1fe..e70d7c6c2 100644 --- a/src/main/java/net/minestom/server/entity/metadata/other/MagmaCubeMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/other/MagmaCubeMeta.java @@ -2,13 +2,12 @@ package net.minestom.server.entity.metadata.other; import net.minestom.server.entity.Entity; import net.minestom.server.entity.Metadata; -import net.minestom.server.entity.metadata.MobMeta; import org.jetbrains.annotations.NotNull; public class MagmaCubeMeta extends SlimeMeta { - public MagmaCubeMeta(@NotNull Entity entity) { - super(entity); + public MagmaCubeMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/other/PaintingMeta.java b/src/main/java/net/minestom/server/entity/metadata/other/PaintingMeta.java index 8f1db38a3..d0ce2ae9d 100644 --- a/src/main/java/net/minestom/server/entity/metadata/other/PaintingMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/other/PaintingMeta.java @@ -1,13 +1,14 @@ package net.minestom.server.entity.metadata.other; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import net.minestom.server.entity.metadata.EntityMeta; import org.jetbrains.annotations.NotNull; public class PaintingMeta extends EntityMeta { - public PaintingMeta(@NotNull Entity entity) { - super(entity); + public PaintingMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/other/PrimedTntMeta.java b/src/main/java/net/minestom/server/entity/metadata/other/PrimedTntMeta.java index c4405fa58..442851d3e 100644 --- a/src/main/java/net/minestom/server/entity/metadata/other/PrimedTntMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/other/PrimedTntMeta.java @@ -7,16 +7,16 @@ import org.jetbrains.annotations.NotNull; public class PrimedTntMeta extends BaseEntityMeta { - public PrimedTntMeta(@NotNull Entity entity) { - super(entity); + public PrimedTntMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public int getFuseTime() { - return getMetadata().getIndex((byte) 7, 80); + return super.metadata.getIndex((byte) 7, 80); } public void setFuseTime(int value) { - getMetadata().setIndex((byte) 7, Metadata.VarInt(value)); + super.metadata.setIndex((byte) 7, Metadata.VarInt(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/other/ShulkerBulletMeta.java b/src/main/java/net/minestom/server/entity/metadata/other/ShulkerBulletMeta.java index 1b06ac21f..00f9cf38d 100644 --- a/src/main/java/net/minestom/server/entity/metadata/other/ShulkerBulletMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/other/ShulkerBulletMeta.java @@ -1,13 +1,14 @@ package net.minestom.server.entity.metadata.other; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import net.minestom.server.entity.metadata.BaseEntityMeta; import org.jetbrains.annotations.NotNull; public class ShulkerBulletMeta extends BaseEntityMeta { - public ShulkerBulletMeta(@NotNull Entity entity) { - super(entity); + public ShulkerBulletMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/other/SlimeMeta.java b/src/main/java/net/minestom/server/entity/metadata/other/SlimeMeta.java index 6a57e1fd5..495cdae82 100644 --- a/src/main/java/net/minestom/server/entity/metadata/other/SlimeMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/other/SlimeMeta.java @@ -7,18 +7,18 @@ import org.jetbrains.annotations.NotNull; public class SlimeMeta extends MobMeta { - public SlimeMeta(@NotNull Entity entity) { - super(entity); + public SlimeMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public int getSize() { - return getMetadata().getIndex((byte) 15, 0); + return super.metadata.getIndex((byte) 15, 0); } public void setSize(int value) { float boxSize = 0.51000005f * value; setBoundingBox(boxSize, boxSize); - getMetadata().setIndex((byte) 15, Metadata.VarInt(value)); + super.metadata.setIndex((byte) 15, Metadata.VarInt(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/other/TraderLlamaMeta.java b/src/main/java/net/minestom/server/entity/metadata/other/TraderLlamaMeta.java index a57dcf577..78d655be2 100644 --- a/src/main/java/net/minestom/server/entity/metadata/other/TraderLlamaMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/other/TraderLlamaMeta.java @@ -1,13 +1,14 @@ package net.minestom.server.entity.metadata.other; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import net.minestom.server.entity.metadata.BaseEntityMeta; import org.jetbrains.annotations.NotNull; public class TraderLlamaMeta extends BaseEntityMeta { - public TraderLlamaMeta(@NotNull Entity entity) { - super(entity); + public TraderLlamaMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/other/WitherSkullMeta.java b/src/main/java/net/minestom/server/entity/metadata/other/WitherSkullMeta.java index 933942a24..1f2b87d99 100644 --- a/src/main/java/net/minestom/server/entity/metadata/other/WitherSkullMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/other/WitherSkullMeta.java @@ -7,16 +7,16 @@ import org.jetbrains.annotations.NotNull; public class WitherSkullMeta extends BaseEntityMeta { - public WitherSkullMeta(@NotNull Entity entity) { - super(entity); + public WitherSkullMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public boolean isInvulnerable() { - return getMetadata().getIndex((byte) 7, false); + return super.metadata.getIndex((byte) 7, false); } public void setInvulnerable(boolean value) { - getMetadata().setIndex((byte) 7, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 7, Metadata.Boolean(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/villager/AbstractVillagerMeta.java b/src/main/java/net/minestom/server/entity/metadata/villager/AbstractVillagerMeta.java index 9cd4d91b2..4244c4e75 100644 --- a/src/main/java/net/minestom/server/entity/metadata/villager/AbstractVillagerMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/villager/AbstractVillagerMeta.java @@ -7,15 +7,15 @@ import org.jetbrains.annotations.NotNull; public class AbstractVillagerMeta extends AgeableMobMeta { - protected AbstractVillagerMeta(@NotNull Entity entity) { - super(entity); + protected AbstractVillagerMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public int getHeadShakeTimer() { - return getMetadata().getIndex((byte) 16, 0); + return super.metadata.getIndex((byte) 16, 0); } public void setHeadShakeTimer(int value) { - getMetadata().setIndex((byte) 16, Metadata.VarInt(value)); + super.metadata.setIndex((byte) 16, Metadata.VarInt(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/villager/VillagerMeta.java b/src/main/java/net/minestom/server/entity/metadata/villager/VillagerMeta.java index 75afe2cca..724f65354 100644 --- a/src/main/java/net/minestom/server/entity/metadata/villager/VillagerMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/villager/VillagerMeta.java @@ -6,13 +6,13 @@ import org.jetbrains.annotations.NotNull; public class VillagerMeta extends AbstractVillagerMeta { - public VillagerMeta(@NotNull Entity entity) { - super(entity); + public VillagerMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } @NotNull public VillagerData getVillagerData() { - int[] data = getMetadata().getIndex((byte) 17, null); + int[] data = super.metadata.getIndex((byte) 17, null); if (data == null) { return new VillagerData(Type.PLAINS, Profession.NONE, Level.NOVICE); } @@ -20,7 +20,7 @@ public class VillagerMeta extends AbstractVillagerMeta { } public void setVillagerData(@NotNull VillagerData data) { - getMetadata().setIndex((byte) 17, Metadata.VillagerData( + super.metadata.setIndex((byte) 17, Metadata.VillagerData( data.type.ordinal(), data.profession.ordinal(), data.level.ordinal() + 1 diff --git a/src/main/java/net/minestom/server/entity/metadata/villager/WanderingTraderMeta.java b/src/main/java/net/minestom/server/entity/metadata/villager/WanderingTraderMeta.java index 6467bd643..2384b63b5 100644 --- a/src/main/java/net/minestom/server/entity/metadata/villager/WanderingTraderMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/villager/WanderingTraderMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata.villager; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class WanderingTraderMeta extends VillagerMeta { - public WanderingTraderMeta(@NotNull Entity entity) { - super(entity); + public WanderingTraderMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/water/DolphinMeta.java b/src/main/java/net/minestom/server/entity/metadata/water/DolphinMeta.java index 4e1ddc7a7..7dc4f37e7 100644 --- a/src/main/java/net/minestom/server/entity/metadata/water/DolphinMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/water/DolphinMeta.java @@ -7,33 +7,33 @@ import org.jetbrains.annotations.NotNull; public class DolphinMeta extends WaterAnimalMeta { - public DolphinMeta(@NotNull Entity entity) { - super(entity); + public DolphinMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } @NotNull public BlockPosition getTreasurePosition() { - return getMetadata().getIndex((byte) 15, new BlockPosition(0, 0, 0)); + return super.metadata.getIndex((byte) 15, new BlockPosition(0, 0, 0)); } public void setTreasurePosition(@NotNull BlockPosition value) { - getMetadata().setIndex((byte) 15, Metadata.Position(value)); + super.metadata.setIndex((byte) 15, Metadata.Position(value)); } public boolean isCanFindTreasure() { - return getMetadata().getIndex((byte) 16, false); + return super.metadata.getIndex((byte) 16, false); } public void setCanFindTreasure(boolean value) { - getMetadata().setIndex((byte) 16, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 16, Metadata.Boolean(value)); } public boolean isHasFish() { - return getMetadata().getIndex((byte) 17, false); + return super.metadata.getIndex((byte) 17, false); } public void setHasFish(boolean value) { - getMetadata().setIndex((byte) 17, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 17, Metadata.Boolean(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/water/SquidMeta.java b/src/main/java/net/minestom/server/entity/metadata/water/SquidMeta.java index f564f77d6..b1c24e42d 100644 --- a/src/main/java/net/minestom/server/entity/metadata/water/SquidMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/water/SquidMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata.water; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class SquidMeta extends WaterAnimalMeta { - public SquidMeta(@NotNull Entity entity) { - super(entity); + public SquidMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/water/WaterAnimalMeta.java b/src/main/java/net/minestom/server/entity/metadata/water/WaterAnimalMeta.java index 905b00b84..587f0c490 100644 --- a/src/main/java/net/minestom/server/entity/metadata/water/WaterAnimalMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/water/WaterAnimalMeta.java @@ -1,13 +1,14 @@ package net.minestom.server.entity.metadata.water; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import net.minestom.server.entity.metadata.PathfinderMobMeta; import org.jetbrains.annotations.NotNull; public class WaterAnimalMeta extends PathfinderMobMeta { - protected WaterAnimalMeta(@NotNull Entity entity) { - super(entity); + protected WaterAnimalMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/water/fish/AbstractFishMeta.java b/src/main/java/net/minestom/server/entity/metadata/water/fish/AbstractFishMeta.java index 41c9b901c..c62455368 100644 --- a/src/main/java/net/minestom/server/entity/metadata/water/fish/AbstractFishMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/water/fish/AbstractFishMeta.java @@ -7,15 +7,15 @@ import org.jetbrains.annotations.NotNull; public class AbstractFishMeta extends WaterAnimalMeta { - protected AbstractFishMeta(@NotNull Entity entity) { - super(entity); + protected AbstractFishMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public boolean isFromBucket() { - return getMetadata().getIndex((byte) 15, false); + return super.metadata.getIndex((byte) 15, false); } public void setFromBucket(boolean value) { - getMetadata().setIndex((byte) 15, Metadata.Boolean(value)); + super.metadata.setIndex((byte) 15, Metadata.Boolean(value)); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/water/fish/CodMeta.java b/src/main/java/net/minestom/server/entity/metadata/water/fish/CodMeta.java index 0226dbb85..5add05569 100644 --- a/src/main/java/net/minestom/server/entity/metadata/water/fish/CodMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/water/fish/CodMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata.water.fish; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class CodMeta extends AbstractFishMeta { - public CodMeta(@NotNull Entity entity) { - super(entity); + public CodMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/water/fish/PufferfishMeta.java b/src/main/java/net/minestom/server/entity/metadata/water/fish/PufferfishMeta.java index 1274f540a..d14bcbf6b 100644 --- a/src/main/java/net/minestom/server/entity/metadata/water/fish/PufferfishMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/water/fish/PufferfishMeta.java @@ -6,16 +6,16 @@ import org.jetbrains.annotations.NotNull; public class PufferfishMeta extends AbstractFishMeta { - public PufferfishMeta(@NotNull Entity entity) { - super(entity); + public PufferfishMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public State getState() { - return State.VALUES[getMetadata().getIndex((byte) 16, 0)]; + return State.VALUES[super.metadata.getIndex((byte) 16, 0)]; } public void setState(State state) { - getMetadata().setIndex((byte) 16, Metadata.VarInt(state.ordinal())); + super.metadata.setIndex((byte) 16, Metadata.VarInt(state.ordinal())); updateBoundingBox(state); } diff --git a/src/main/java/net/minestom/server/entity/metadata/water/fish/SalmonMeta.java b/src/main/java/net/minestom/server/entity/metadata/water/fish/SalmonMeta.java index 7c329b196..2b57af49c 100644 --- a/src/main/java/net/minestom/server/entity/metadata/water/fish/SalmonMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/water/fish/SalmonMeta.java @@ -1,12 +1,13 @@ package net.minestom.server.entity.metadata.water.fish; import net.minestom.server.entity.Entity; +import net.minestom.server.entity.Metadata; import org.jetbrains.annotations.NotNull; public class SalmonMeta extends AbstractFishMeta { - public SalmonMeta(@NotNull Entity entity) { - super(entity); + public SalmonMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } } diff --git a/src/main/java/net/minestom/server/entity/metadata/water/fish/TropicalFishMeta.java b/src/main/java/net/minestom/server/entity/metadata/water/fish/TropicalFishMeta.java index cdbdb6aec..99f477384 100644 --- a/src/main/java/net/minestom/server/entity/metadata/water/fish/TropicalFishMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/water/fish/TropicalFishMeta.java @@ -6,16 +6,16 @@ import org.jetbrains.annotations.NotNull; public class TropicalFishMeta extends AbstractFishMeta { - public TropicalFishMeta(@NotNull Entity entity) { - super(entity); + public TropicalFishMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + super(entity, metadata); } public Variant getVariant() { - return getVariantFromID(getMetadata().getIndex((byte) 16, 0)); + return getVariantFromID(super.metadata.getIndex((byte) 16, 0)); } public void setVariant(Variant variant) { - getMetadata().setIndex((byte) 16, Metadata.VarInt(getVariantID(variant))); + super.metadata.setIndex((byte) 16, Metadata.VarInt(getVariantID(variant))); } public static int getVariantID(Variant variant) { diff --git a/src/test/java/demo/commands/HorseCommand.java b/src/test/java/demo/commands/HorseCommand.java index 7745caba2..cc5bd7cce 100644 --- a/src/test/java/demo/commands/HorseCommand.java +++ b/src/test/java/demo/commands/HorseCommand.java @@ -66,7 +66,7 @@ public class HorseCommand extends Command { HorseMeta.Marking marking = args.get("marking"); HorseMeta.Color color = args.get("color"); var horse = new EntityCreature(EntityType.HORSE, player.getPosition()); - var meta = new HorseMeta(horse); + var meta = (HorseMeta) horse.getEntityMeta(); meta.setBaby(baby); meta.setVariant(new HorseMeta.Variant(marking, color)); horse.setInstance(player.getInstance()); diff --git a/src/test/java/demo/commands/ShootCommand.java b/src/test/java/demo/commands/ShootCommand.java index 8b242ba19..60950889b 100644 --- a/src/test/java/demo/commands/ShootCommand.java +++ b/src/test/java/demo/commands/ShootCommand.java @@ -55,7 +55,7 @@ public class ShootCommand extends Command { break; case "colored": projectile = new EntityArrow(player, pos); - var meta = new ArrowMeta((Entity) projectile); + var meta = (ArrowMeta) ((Entity) projectile).getEntityMeta(); meta.setColor(ThreadLocalRandom.current().nextInt()); break; default: