From 27f30fa394f28c02dc1de415ebb1a7f1ddbebed6 Mon Sep 17 00:00:00 2001
From: TheMode <themode@outlook.fr>
Date: Mon, 14 Jun 2021 21:49:16 +0200
Subject: [PATCH] Remove a few magic metadata indexes

---
 .../java/net/minestom/server/entity/ItemEntity.java    |  9 +++++----
 src/main/java/net/minestom/server/entity/Player.java   | 10 ++++++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/main/java/net/minestom/server/entity/ItemEntity.java b/src/main/java/net/minestom/server/entity/ItemEntity.java
index c110740a0..275348262 100644
--- a/src/main/java/net/minestom/server/entity/ItemEntity.java
+++ b/src/main/java/net/minestom/server/entity/ItemEntity.java
@@ -1,5 +1,6 @@
 package net.minestom.server.entity;
 
+import net.minestom.server.entity.metadata.item.ItemEntityMeta;
 import net.minestom.server.event.EventDispatcher;
 import net.minestom.server.event.entity.EntityItemMergeEvent;
 import net.minestom.server.instance.Chunk;
@@ -18,7 +19,7 @@ import java.util.Set;
 /**
  * Represents an item on the ground.
  */
-public class ItemEntity extends ObjectEntity {
+public class ItemEntity extends Entity {
 
     /**
      * Used to slow down the merge check delay
@@ -129,8 +130,8 @@ public class ItemEntity extends ObjectEntity {
     }
 
     @Override
-    public int getObjectData() {
-        return 1;
+    public @NotNull ItemEntityMeta getEntityMeta() {
+        return (ItemEntityMeta) super.getEntityMeta();
     }
 
     /**
@@ -150,7 +151,7 @@ public class ItemEntity extends ObjectEntity {
      */
     public void setItemStack(@NotNull ItemStack itemStack) {
         this.itemStack = itemStack;
-        this.metadata.setIndex((byte) 7, Metadata.Slot(itemStack));
+        getEntityMeta().setItem(itemStack);
     }
 
     /**
diff --git a/src/main/java/net/minestom/server/entity/Player.java b/src/main/java/net/minestom/server/entity/Player.java
index 0461591d7..c82922607 100644
--- a/src/main/java/net/minestom/server/entity/Player.java
+++ b/src/main/java/net/minestom/server/entity/Player.java
@@ -29,6 +29,7 @@ import net.minestom.server.command.CommandSender;
 import net.minestom.server.effects.Effects;
 import net.minestom.server.entity.damage.DamageType;
 import net.minestom.server.entity.fakeplayer.FakePlayer;
+import net.minestom.server.entity.metadata.PlayerMeta;
 import net.minestom.server.entity.vehicle.PlayerVehicleInformation;
 import net.minestom.server.event.EventDispatcher;
 import net.minestom.server.event.inventory.InventoryOpenEvent;
@@ -1037,13 +1038,18 @@ public class Player extends LivingEntity implements CommandSender, Localizable,
         sendUpdateHealthPacket();
     }
 
+    @Override
+    public @NotNull PlayerMeta getEntityMeta() {
+        return (PlayerMeta) super.getEntityMeta();
+    }
+
     /**
      * Gets the player additional hearts.
      *
      * @return the player additional hearts
      */
     public float getAdditionalHearts() {
-        return metadata.getIndex((byte) 14, 0f);
+        return getEntityMeta().getAdditionalHearts();
     }
 
     /**
@@ -1052,7 +1058,7 @@ public class Player extends LivingEntity implements CommandSender, Localizable,
      * @param additionalHearts the count of additional hearts
      */
     public void setAdditionalHearts(float additionalHearts) {
-        this.metadata.setIndex((byte) 14, Metadata.Float(additionalHearts));
+        getEntityMeta().setAdditionalHearts(additionalHearts);
     }
 
     /**