diff --git a/common/src/main/java/me/filoghost/holographicdisplays/common/nms/entity/TextNMSPacketEntity.java b/common/src/main/java/me/filoghost/holographicdisplays/common/nms/entity/TextNMSPacketEntity.java index f3698781..9575d8e4 100644 --- a/common/src/main/java/me/filoghost/holographicdisplays/common/nms/entity/TextNMSPacketEntity.java +++ b/common/src/main/java/me/filoghost/holographicdisplays/common/nms/entity/TextNMSPacketEntity.java @@ -13,8 +13,6 @@ public interface TextNMSPacketEntity extends NMSPacketEntity { double ARMOR_STAND_Y_OFFSET = -0.29; double ARMOR_STAND_TEXT_HEIGHT = 0.23; - void addSpawnPackets(NMSPacketList packetList, double positionX, double positionY, double positionZ); - void addSpawnPackets(NMSPacketList packetList, double positionX, double positionY, double positionZ, String text); void addSpawnPackets(NMSPacketList packetList, double positionX, double positionY, double positionZ, IndividualText individualText); diff --git a/nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/VersionTextNMSPacketEntity.java b/nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/VersionTextNMSPacketEntity.java index de27eb9b..94be6b82 100644 --- a/nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/VersionTextNMSPacketEntity.java +++ b/nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/VersionTextNMSPacketEntity.java @@ -19,16 +19,6 @@ class VersionTextNMSPacketEntity implements TextNMSPacketEntity { this.armorStandID = armorStandID; } - @Override - public void addSpawnPackets(NMSPacketList packetList, double positionX, double positionY, double positionZ) { - packetList.add(new EntitySpawnNMSPacket( - armorStandID, EntityTypeID.ARMOR_STAND, positionX, positionY + ARMOR_STAND_Y_OFFSET, positionZ)); - packetList.add(EntityMetadataNMSPacket.builder(armorStandID) - .setArmorStandMarker() - .build() - ); - } - @Override public void addSpawnPackets(NMSPacketList packetList, double positionX, double positionY, double positionZ, String text) { packetList.add(new EntitySpawnNMSPacket( diff --git a/nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/VersionTextNMSPacketEntity.java b/nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/VersionTextNMSPacketEntity.java index caf3cf52..3bd5d2b5 100644 --- a/nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/VersionTextNMSPacketEntity.java +++ b/nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/VersionTextNMSPacketEntity.java @@ -19,16 +19,6 @@ class VersionTextNMSPacketEntity implements TextNMSPacketEntity { this.armorStandID = armorStandID; } - @Override - public void addSpawnPackets(NMSPacketList packetList, double positionX, double positionY, double positionZ) { - packetList.add(new EntitySpawnNMSPacket( - armorStandID, EntityTypeID.ARMOR_STAND, positionX, positionY + ARMOR_STAND_Y_OFFSET, positionZ)); - packetList.add(EntityMetadataNMSPacket.builder(armorStandID) - .setArmorStandMarker() - .build() - ); - } - @Override public void addSpawnPackets(NMSPacketList packetList, double positionX, double positionY, double positionZ, String text) { packetList.add(new EntitySpawnNMSPacket( diff --git a/nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/VersionTextNMSPacketEntity.java b/nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/VersionTextNMSPacketEntity.java index c2194fb1..38ef4a5c 100644 --- a/nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/VersionTextNMSPacketEntity.java +++ b/nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/VersionTextNMSPacketEntity.java @@ -19,16 +19,6 @@ class VersionTextNMSPacketEntity implements TextNMSPacketEntity { this.armorStandID = armorStandID; } - @Override - public void addSpawnPackets(NMSPacketList packetList, double positionX, double positionY, double positionZ) { - packetList.add(new EntitySpawnNMSPacket( - armorStandID, EntityTypeID.ARMOR_STAND, positionX, positionY + ARMOR_STAND_Y_OFFSET, positionZ)); - packetList.add(EntityMetadataNMSPacket.builder(armorStandID) - .setArmorStandMarker() - .build() - ); - } - @Override public void addSpawnPackets(NMSPacketList packetList, double positionX, double positionY, double positionZ, String text) { packetList.add(new EntitySpawnNMSPacket( diff --git a/nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/VersionTextNMSPacketEntity.java b/nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/VersionTextNMSPacketEntity.java index 4c45dc58..7e9b5c39 100644 --- a/nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/VersionTextNMSPacketEntity.java +++ b/nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/VersionTextNMSPacketEntity.java @@ -19,16 +19,6 @@ class VersionTextNMSPacketEntity implements TextNMSPacketEntity { this.armorStandID = armorStandID; } - @Override - public void addSpawnPackets(NMSPacketList packetList, double positionX, double positionY, double positionZ) { - packetList.add(new EntitySpawnNMSPacket( - armorStandID, EntityTypeID.ARMOR_STAND, positionX, positionY + ARMOR_STAND_Y_OFFSET, positionZ)); - packetList.add(EntityMetadataNMSPacket.builder(armorStandID) - .setArmorStandMarker() - .build() - ); - } - @Override public void addSpawnPackets(NMSPacketList packetList, double positionX, double positionY, double positionZ, String text) { packetList.add(new EntitySpawnNMSPacket( diff --git a/nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/VersionTextNMSPacketEntity.java b/nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/VersionTextNMSPacketEntity.java index 0ea86bd6..9d55f623 100644 --- a/nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/VersionTextNMSPacketEntity.java +++ b/nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/VersionTextNMSPacketEntity.java @@ -19,15 +19,6 @@ class VersionTextNMSPacketEntity implements TextNMSPacketEntity { this.armorStandID = armorStandID; } - @Override - public void addSpawnPackets(NMSPacketList packetList, double positionX, double positionY, double positionZ) { - packetList.add(EntityLivingSpawnNMSPacket.builder( - armorStandID, EntityTypeID.ARMOR_STAND, positionX, positionY + ARMOR_STAND_Y_OFFSET, positionZ) - .setArmorStandMarker() - .build() - ); - } - @Override public void addSpawnPackets(NMSPacketList packetList, double positionX, double positionY, double positionZ, String text) { packetList.add(EntityLivingSpawnNMSPacket.builder( diff --git a/nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/VersionTextNMSPacketEntity.java b/nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/VersionTextNMSPacketEntity.java index d0c71d62..e1b2a1aa 100644 --- a/nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/VersionTextNMSPacketEntity.java +++ b/nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/VersionTextNMSPacketEntity.java @@ -19,16 +19,6 @@ class VersionTextNMSPacketEntity implements TextNMSPacketEntity { this.armorStandID = armorStandID; } - @Override - public void addSpawnPackets(NMSPacketList packetList, double positionX, double positionY, double positionZ) { - packetList.add(new EntityLivingSpawnNMSPacket( - armorStandID, EntityTypeID.ARMOR_STAND, positionX, positionY + ARMOR_STAND_Y_OFFSET, positionZ)); - packetList.add(EntityMetadataNMSPacket.builder(armorStandID) - .setArmorStandMarker() - .build() - ); - } - @Override public void addSpawnPackets(NMSPacketList packetList, double positionX, double positionY, double positionZ, String text) { packetList.add(new EntityLivingSpawnNMSPacket( diff --git a/nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/VersionTextNMSPacketEntity.java b/nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/VersionTextNMSPacketEntity.java index 52613593..64159501 100644 --- a/nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/VersionTextNMSPacketEntity.java +++ b/nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/VersionTextNMSPacketEntity.java @@ -19,16 +19,6 @@ class VersionTextNMSPacketEntity implements TextNMSPacketEntity { this.armorStandID = armorStandID; } - @Override - public void addSpawnPackets(NMSPacketList packetList, double positionX, double positionY, double positionZ) { - packetList.add(new EntityLivingSpawnNMSPacket( - armorStandID, EntityTypeID.ARMOR_STAND, positionX, positionY + ARMOR_STAND_Y_OFFSET, positionZ)); - packetList.add(EntityMetadataNMSPacket.builder(armorStandID) - .setArmorStandMarker() - .build() - ); - } - @Override public void addSpawnPackets(NMSPacketList packetList, double positionX, double positionY, double positionZ, String text) { packetList.add(new EntityLivingSpawnNMSPacket( diff --git a/nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/VersionTextNMSPacketEntity.java b/nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/VersionTextNMSPacketEntity.java index 199db0c5..d12bfa0e 100644 --- a/nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/VersionTextNMSPacketEntity.java +++ b/nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/VersionTextNMSPacketEntity.java @@ -19,16 +19,6 @@ class VersionTextNMSPacketEntity implements TextNMSPacketEntity { this.armorStandID = armorStandID; } - @Override - public void addSpawnPackets(NMSPacketList packetList, double positionX, double positionY, double positionZ) { - packetList.add(new EntityLivingSpawnNMSPacket( - armorStandID, EntityTypeID.ARMOR_STAND, positionX, positionY + ARMOR_STAND_Y_OFFSET, positionZ)); - packetList.add(EntityMetadataNMSPacket.builder(armorStandID) - .setArmorStandMarker() - .build() - ); - } - @Override public void addSpawnPackets(NMSPacketList packetList, double positionX, double positionY, double positionZ, String text) { packetList.add(new EntityLivingSpawnNMSPacket( diff --git a/nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/VersionTextNMSPacketEntity.java b/nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/VersionTextNMSPacketEntity.java index 11532ee8..edbd47e5 100644 --- a/nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/VersionTextNMSPacketEntity.java +++ b/nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/VersionTextNMSPacketEntity.java @@ -19,16 +19,6 @@ class VersionTextNMSPacketEntity implements TextNMSPacketEntity { this.armorStandID = armorStandID; } - @Override - public void addSpawnPackets(NMSPacketList packetList, double positionX, double positionY, double positionZ) { - packetList.add(new EntityLivingSpawnNMSPacket( - armorStandID, EntityTypeID.ARMOR_STAND, positionX, positionY + ARMOR_STAND_Y_OFFSET, positionZ)); - packetList.add(EntityMetadataNMSPacket.builder(armorStandID) - .setArmorStandMarker() - .build() - ); - } - @Override public void addSpawnPackets(NMSPacketList packetList, double positionX, double positionY, double positionZ, String text) { packetList.add(new EntityLivingSpawnNMSPacket( diff --git a/nms/v1_17_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_17_R1/VersionTextNMSPacketEntity.java b/nms/v1_17_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_17_R1/VersionTextNMSPacketEntity.java index 1bfeae47..e56b790e 100644 --- a/nms/v1_17_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_17_R1/VersionTextNMSPacketEntity.java +++ b/nms/v1_17_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_17_R1/VersionTextNMSPacketEntity.java @@ -19,16 +19,6 @@ class VersionTextNMSPacketEntity implements TextNMSPacketEntity { this.armorStandID = armorStandID; } - @Override - public void addSpawnPackets(NMSPacketList packetList, double positionX, double positionY, double positionZ) { - packetList.add(new EntityLivingSpawnNMSPacket( - armorStandID, EntityTypeID.ARMOR_STAND, positionX, positionY + ARMOR_STAND_Y_OFFSET, positionZ)); - packetList.add(EntityMetadataNMSPacket.builder(armorStandID) - .setArmorStandMarker() - .build() - ); - } - @Override public void addSpawnPackets(NMSPacketList packetList, double positionX, double positionY, double positionZ, String text) { packetList.add(new EntityLivingSpawnNMSPacket( diff --git a/nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/VersionTextNMSPacketEntity.java b/nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/VersionTextNMSPacketEntity.java index 87905f85..9d8610fe 100644 --- a/nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/VersionTextNMSPacketEntity.java +++ b/nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/VersionTextNMSPacketEntity.java @@ -19,16 +19,6 @@ class VersionTextNMSPacketEntity implements TextNMSPacketEntity { this.armorStandID = armorStandID; } - @Override - public void addSpawnPackets(NMSPacketList packetList, double positionX, double positionY, double positionZ) { - packetList.add(new EntitySpawnNMSPacket( - armorStandID, EntityTypeID.ARMOR_STAND, positionX, positionY + ARMOR_STAND_Y_OFFSET, positionZ)); - packetList.add(EntityMetadataNMSPacket.builder(armorStandID) - .setArmorStandMarker() - .build() - ); - } - @Override public void addSpawnPackets(NMSPacketList packetList, double positionX, double positionY, double positionZ, String text) { packetList.add(new EntitySpawnNMSPacket( diff --git a/nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/VersionTextNMSPacketEntity.java b/nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/VersionTextNMSPacketEntity.java index 0baf9ceb..73debdae 100644 --- a/nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/VersionTextNMSPacketEntity.java +++ b/nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/VersionTextNMSPacketEntity.java @@ -19,16 +19,6 @@ class VersionTextNMSPacketEntity implements TextNMSPacketEntity { this.armorStandID = armorStandID; } - @Override - public void addSpawnPackets(NMSPacketList packetList, double positionX, double positionY, double positionZ) { - packetList.add(new EntitySpawnNMSPacket( - armorStandID, EntityTypeID.ARMOR_STAND, positionX, positionY + ARMOR_STAND_Y_OFFSET, positionZ)); - packetList.add(EntityMetadataNMSPacket.builder(armorStandID) - .setArmorStandMarker() - .build() - ); - } - @Override public void addSpawnPackets(NMSPacketList packetList, double positionX, double positionY, double positionZ, String text) { packetList.add(new EntitySpawnNMSPacket(