EntityMetadataProvider has been added, to allow potential packetevent…

…s addons to add on to our metadata abstraction.
retrooper · Nov 27, 2023 · 4196999 · 4196999
1 parent 4a2146d
commit 4196999
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 0 deletions.
diff --git a/...n/java/com/github/retrooper/packetevents/protocol/entity/data/EntityMetadataProvider.java b/...n/java/com/github/retrooper/packetevents/protocol/entity/data/EntityMetadataProvider.java
@@ -0,0 +1,7 @@
+package com.github.retrooper.packetevents.protocol.entity.data;
+
+import java.util.List;
+
+public interface EntityMetadataProvider {
+    List<EntityData> entityData();
+}
diff --git a/api/src/main/java/com/github/retrooper/packetevents/wrapper/PacketWrapper.java b/api/src/main/java/com/github/retrooper/packetevents/wrapper/PacketWrapper.java
@@ -34,6 +34,7 @@
 import com.github.retrooper.packetevents.protocol.entity.data.EntityData;
 import com.github.retrooper.packetevents.protocol.entity.data.EntityDataType;
 import com.github.retrooper.packetevents.protocol.entity.data.EntityDataTypes;
+import com.github.retrooper.packetevents.protocol.entity.data.EntityMetadataProvider;
 import com.github.retrooper.packetevents.protocol.entity.villager.VillagerData;
 import com.github.retrooper.packetevents.protocol.item.ItemStack;
 import com.github.retrooper.packetevents.protocol.item.type.ItemType;
@@ -773,6 +774,10 @@ public void writeEntityMetadata(List<EntityData> list) {
         }
     }
 
+    public void writeEntityMetadata(EntityMetadataProvider metadata) {
+        writeEntityMetadata(metadata.entityData());
+    }
+
     public Dimension readDimension() {
         if (PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_19)) {
             Dimension dimension = new Dimension(new NBTCompound());

diff --git a/...om/github/retrooper/packetevents/wrapper/play/server/WrapperPlayServerEntityMetadata.java b/...om/github/retrooper/packetevents/wrapper/play/server/WrapperPlayServerEntityMetadata.java
@@ -21,6 +21,7 @@
 import com.github.retrooper.packetevents.event.PacketSendEvent;
 import com.github.retrooper.packetevents.manager.server.ServerVersion;
 import com.github.retrooper.packetevents.protocol.entity.data.EntityData;
+import com.github.retrooper.packetevents.protocol.entity.data.EntityMetadataProvider;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
 import com.github.retrooper.packetevents.wrapper.PacketWrapper;
 
@@ -40,6 +41,10 @@ public WrapperPlayServerEntityMetadata(int entityID, List<EntityData> entityMeta
         this.entityMetadata = entityMetadata;
     }
 
+    public WrapperPlayServerEntityMetadata(int entityID, EntityMetadataProvider metadata) {
+        this(entityID, metadata.entityData());
+    }
+
     @Override
     public void read() {
         entityID = serverVersion.isNewerThanOrEquals(ServerVersion.V_1_8) ? readVarInt() : readInt();
@@ -77,4 +82,8 @@ public List<EntityData> getEntityMetadata() {
     public void setEntityMetadata(List<EntityData> entityMetadata) {
         this.entityMetadata = entityMetadata;
     }
+
+    public void setEntityMetadata(EntityMetadataProvider metadata) {
+        this.entityMetadata = metadata.entityData();
+    }
 }
diff --git a/...github/retrooper/packetevents/wrapper/play/server/WrapperPlayServerSpawnLivingEntity.java b/...github/retrooper/packetevents/wrapper/play/server/WrapperPlayServerSpawnLivingEntity.java
@@ -21,6 +21,7 @@
 import com.github.retrooper.packetevents.event.PacketSendEvent;
 import com.github.retrooper.packetevents.manager.server.ServerVersion;
 import com.github.retrooper.packetevents.protocol.entity.data.EntityData;
+import com.github.retrooper.packetevents.protocol.entity.data.EntityMetadataProvider;
 import com.github.retrooper.packetevents.protocol.entity.type.EntityType;
 import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
@@ -64,6 +65,10 @@ public WrapperPlayServerSpawnLivingEntity(int entityID, UUID entityUUID, EntityT
         this.entityMetadata = entityMetadata;
     }
 
+    public WrapperPlayServerSpawnLivingEntity(int entityID, UUID entityUUID, EntityType entityType, Vector3d position, float yaw, float pitch, float headPitch, Vector3d velocity, EntityMetadataProvider metadata) {
+        this(entityID, entityUUID, entityType, position, yaw, pitch, headPitch, velocity, metadata.entityData());
+    }
+
     public WrapperPlayServerSpawnLivingEntity(int entityId, UUID entityUUID,
                                               EntityType entityType, Location location, float headPitch,
                                               Vector3d velocity,
@@ -72,6 +77,14 @@ public WrapperPlayServerSpawnLivingEntity(int entityId, UUID entityUUID,
                 headPitch, velocity, entityMetadata);
     }
 
+    public WrapperPlayServerSpawnLivingEntity(int entityId, UUID entityUUID,
+                                              EntityType entityType, Location location, float headPitch,
+                                              Vector3d velocity,
+                                              EntityMetadataProvider metadata) {
+        this(entityId, entityUUID, entityType, location.getPosition(), location.getYaw(), location.getPitch(),
+                headPitch, velocity, metadata.entityData());
+    }
+
     @Override
     public void read() {
         this.entityID = readVarInt();
@@ -220,4 +233,8 @@ public List<EntityData> getEntityMetadata() {
     public void setEntityMetadata(List<EntityData> entityMetadata) {
         this.entityMetadata = entityMetadata;
     }
+
+    public void setEntityMetadata(EntityMetadataProvider metadata) {
+        this.entityMetadata = metadata.entityData();
+    }
 }
diff --git a/...a/com/github/retrooper/packetevents/wrapper/play/server/WrapperPlayServerSpawnPlayer.java b/...a/com/github/retrooper/packetevents/wrapper/play/server/WrapperPlayServerSpawnPlayer.java
@@ -21,6 +21,7 @@
 import com.github.retrooper.packetevents.event.PacketSendEvent;
 import com.github.retrooper.packetevents.manager.server.ServerVersion;
 import com.github.retrooper.packetevents.protocol.entity.data.EntityData;
+import com.github.retrooper.packetevents.protocol.entity.data.EntityMetadataProvider;
 import com.github.retrooper.packetevents.protocol.item.type.ItemType;
 import com.github.retrooper.packetevents.protocol.item.type.ItemTypes;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
@@ -50,6 +51,10 @@ public WrapperPlayServerSpawnPlayer(PacketSendEvent event) {
         super(event);
     }
 
+    public WrapperPlayServerSpawnPlayer(int entityId, UUID uuid, Location location, EntityMetadataProvider metadata) {
+        this(entityId, uuid, location.getPosition(), location.getYaw(), location.getPitch(), metadata.entityData());
+    }
+
     public WrapperPlayServerSpawnPlayer(int entityId, UUID uuid, Location location, List<EntityData> entityMetadata) {
         this(entityId, uuid, location.getPosition(), location.getYaw(), location.getPitch(), entityMetadata);
     }
@@ -69,6 +74,10 @@ public WrapperPlayServerSpawnPlayer(int entityID, UUID uuid, Vector3d position,
         this.item = ItemTypes.AIR;
     }
 
+    public WrapperPlayServerSpawnPlayer(int entityID, UUID uuid, Vector3d position, float yaw, float pitch, EntityMetadataProvider metadata) {
+        this(entityID, uuid, position, yaw, pitch, metadata.entityData());
+    }
+
     @Override
     public void read() {
         entityID = readVarInt();
@@ -176,6 +185,11 @@ public void setEntityMetadata(List<EntityData> entityMetadata) {
         this.entityMetadata = entityMetadata;
     }
 
+    @Deprecated
+    public void setEntityMetadata(EntityMetadataProvider metadata) {
+        this.entityMetadata = metadata.entityData();
+    }
+
     @Deprecated
     public ItemType getItem() {
         return item;