Upstream
/
HolographicDisplays
mirror of https://github.com/filoghost/HolographicDisplays.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove unnecessary armor stand with clickable slime

This commit is contained in:
filoghost 2021-08-20 09:55:07 +02:00
parent ad1cfe3f1f
commit 41fb1bc347
24 changed files with 48 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/VersionClickableNMSPacketEntity.java
View File

@ -13,11 +13,9 @@ import me.filoghost.holographicdisplays.common.nms.entity.ClickableNMSPacketEnti
public class VersionClickableNMSPacketEntity implements ClickableNMSPacketEntity {
private final EntityID slimeID;
private final EntityID vehicleID;
public VersionClickableNMSPacketEntity(EntityID slimeID, EntityID vehicleID) {
public VersionClickableNMSPacketEntity(EntityID slimeID) {
this.slimeID = slimeID;
this.vehicleID = vehicleID;
}
@Override
@ -27,27 +25,21 @@ public class VersionClickableNMSPacketEntity implements ClickableNMSPacketEntity
@Override
public void addSpawnPackets(NMSPacketList packetList, Position position) {
packetList.add(new EntitySpawnNMSPacket(vehicleID, EntityTypeID.ARMOR_STAND, position, SLIME_Y_OFFSET));
packetList.add(EntityMetadataNMSPacket.builder(vehicleID)
.setArmorStandMarker()
.build()
);
packetList.add(EntityLivingSpawnNMSPacket.builder(slimeID, EntityTypeID.SLIME, position, SLIME_Y_OFFSET)
.setInvisible()
.setSlimeSmall() // Required for a correct client-side collision box
.build()
);
packetList.add(new EntityMountNMSPacket(vehicleID, slimeID));
}
@Override
public void addTeleportPackets(NMSPacketList packetList, Position position) {
packetList.add(new EntityTeleportNMSPacket(vehicleID, position, SLIME_Y_OFFSET));
packetList.add(new EntityTeleportNMSPacket(slimeID, position, SLIME_Y_OFFSET));
}
@Override
public void addDestroyPackets(NMSPacketList packetList) {
packetList.add(new EntityDestroyNMSPacket(slimeID, vehicleID));
packetList.add(new EntityDestroyNMSPacket(slimeID));
}
}

2
nms/v1_10_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_10_R1/VersionNMSManager.java
View File

@ -83,7 +83,7 @@ public class VersionNMSManager implements NMSManager {
@Override
public ClickableNMSPacketEntity newClickablePacketEntity() {
return new VersionClickableNMSPacketEntity(newEntityID(), newEntityID());
return new VersionClickableNMSPacketEntity(newEntityID());
}
@Override

14
nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/VersionClickableNMSPacketEntity.java
View File

@ -13,11 +13,9 @@ import me.filoghost.holographicdisplays.common.nms.entity.ClickableNMSPacketEnti
public class VersionClickableNMSPacketEntity implements ClickableNMSPacketEntity {
private final EntityID slimeID;
private final EntityID vehicleID;
public VersionClickableNMSPacketEntity(EntityID slimeID, EntityID vehicleID) {
public VersionClickableNMSPacketEntity(EntityID slimeID) {
this.slimeID = slimeID;
this.vehicleID = vehicleID;
}
@Override
@ -27,27 +25,21 @@ public class VersionClickableNMSPacketEntity implements ClickableNMSPacketEntity
@Override
public void addSpawnPackets(NMSPacketList packetList, Position position) {
packetList.add(new EntitySpawnNMSPacket(vehicleID, EntityTypeID.ARMOR_STAND, position, SLIME_Y_OFFSET));
packetList.add(EntityMetadataNMSPacket.builder(vehicleID)
.setArmorStandMarker()
.build()
);
packetList.add(EntityLivingSpawnNMSPacket.builder(slimeID, EntityTypeID.SLIME, position, SLIME_Y_OFFSET)
.setInvisible()
.setSlimeSmall() // Required for a correct client-side collision box
.build()
);
packetList.add(new EntityMountNMSPacket(vehicleID, slimeID));
}
@Override
public void addTeleportPackets(NMSPacketList packetList, Position position) {
packetList.add(new EntityTeleportNMSPacket(vehicleID, position, SLIME_Y_OFFSET));
packetList.add(new EntityTeleportNMSPacket(slimeID, position, SLIME_Y_OFFSET));
}
@Override
public void addDestroyPackets(NMSPacketList packetList) {
packetList.add(new EntityDestroyNMSPacket(slimeID, vehicleID));
packetList.add(new EntityDestroyNMSPacket(slimeID));
}
}

2
nms/v1_11_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_11_R1/VersionNMSManager.java
View File

@ -83,7 +83,7 @@ public class VersionNMSManager implements NMSManager {
@Override
public ClickableNMSPacketEntity newClickablePacketEntity() {
return new VersionClickableNMSPacketEntity(newEntityID(), newEntityID());
return new VersionClickableNMSPacketEntity(newEntityID());
}
@Override

14
nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/VersionClickableNMSPacketEntity.java
View File

@ -13,11 +13,9 @@ import me.filoghost.holographicdisplays.common.nms.entity.ClickableNMSPacketEnti
public class VersionClickableNMSPacketEntity implements ClickableNMSPacketEntity {
private final EntityID slimeID;
private final EntityID vehicleID;
public VersionClickableNMSPacketEntity(EntityID slimeID, EntityID vehicleID) {
public VersionClickableNMSPacketEntity(EntityID slimeID) {
this.slimeID = slimeID;
this.vehicleID = vehicleID;
}
@Override
@ -27,27 +25,21 @@ public class VersionClickableNMSPacketEntity implements ClickableNMSPacketEntity
@Override
public void addSpawnPackets(NMSPacketList packetList, Position position) {
packetList.add(new EntitySpawnNMSPacket(vehicleID, EntityTypeID.ARMOR_STAND, position, SLIME_Y_OFFSET));
packetList.add(EntityMetadataNMSPacket.builder(vehicleID)
.setArmorStandMarker()
.build()
);
packetList.add(EntityLivingSpawnNMSPacket.builder(slimeID, EntityTypeID.SLIME, position, SLIME_Y_OFFSET)
.setInvisible()
.setSlimeSmall() // Required for a correct client-side collision box
.build()
);
packetList.add(new EntityMountNMSPacket(vehicleID, slimeID));
}
@Override
public void addTeleportPackets(NMSPacketList packetList, Position position) {
packetList.add(new EntityTeleportNMSPacket(vehicleID, position, SLIME_Y_OFFSET));
packetList.add(new EntityTeleportNMSPacket(slimeID, position, SLIME_Y_OFFSET));
}
@Override
public void addDestroyPackets(NMSPacketList packetList) {
packetList.add(new EntityDestroyNMSPacket(slimeID, vehicleID));
packetList.add(new EntityDestroyNMSPacket(slimeID));
}
}

2
nms/v1_12_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_12_R1/VersionNMSManager.java
View File

@ -83,7 +83,7 @@ public class VersionNMSManager implements NMSManager {
@Override
public ClickableNMSPacketEntity newClickablePacketEntity() {
return new VersionClickableNMSPacketEntity(newEntityID(), newEntityID());
return new VersionClickableNMSPacketEntity(newEntityID());
}
@Override

14
nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/VersionClickableNMSPacketEntity.java
View File

@ -13,11 +13,9 @@ import me.filoghost.holographicdisplays.common.nms.entity.ClickableNMSPacketEnti
public class VersionClickableNMSPacketEntity implements ClickableNMSPacketEntity {
private final EntityID slimeID;
private final EntityID vehicleID;
public VersionClickableNMSPacketEntity(EntityID slimeID, EntityID vehicleID) {
public VersionClickableNMSPacketEntity(EntityID slimeID) {
this.slimeID = slimeID;
this.vehicleID = vehicleID;
}
@Override
@ -27,27 +25,21 @@ public class VersionClickableNMSPacketEntity implements ClickableNMSPacketEntity
@Override
public void addSpawnPackets(NMSPacketList packetList, Position position) {
packetList.add(new EntitySpawnNMSPacket(vehicleID, EntityTypeID.ARMOR_STAND, position, SLIME_Y_OFFSET));
packetList.add(EntityMetadataNMSPacket.builder(vehicleID)
.setArmorStandMarker()
.build()
);
packetList.add(EntityLivingSpawnNMSPacket.builder(slimeID, EntityTypeID.SLIME, position, SLIME_Y_OFFSET)
.setInvisible()
.setSlimeSmall() // Required for a correct client-side collision box
.build()
);
packetList.add(new EntityMountNMSPacket(vehicleID, slimeID));
}
@Override
public void addTeleportPackets(NMSPacketList packetList, Position position) {
packetList.add(new EntityTeleportNMSPacket(vehicleID, position, SLIME_Y_OFFSET));
packetList.add(new EntityTeleportNMSPacket(slimeID, position, SLIME_Y_OFFSET));
}
@Override
public void addDestroyPackets(NMSPacketList packetList) {
packetList.add(new EntityDestroyNMSPacket(slimeID, vehicleID));
packetList.add(new EntityDestroyNMSPacket(slimeID));
}
}

2
nms/v1_13_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_13_R2/VersionNMSManager.java
View File

@ -83,7 +83,7 @@ public class VersionNMSManager implements NMSManager {
@Override
public ClickableNMSPacketEntity newClickablePacketEntity() {
return new VersionClickableNMSPacketEntity(newEntityID(), newEntityID());
return new VersionClickableNMSPacketEntity(newEntityID());
}
@Override

13
nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/VersionClickableNMSPacketEntity.java
View File

@ -13,11 +13,9 @@ import me.filoghost.holographicdisplays.common.nms.entity.ClickableNMSPacketEnti
public class VersionClickableNMSPacketEntity implements ClickableNMSPacketEntity {
private final EntityID slimeID;
private final EntityID vehicleID;
public VersionClickableNMSPacketEntity(EntityID slimeID, EntityID vehicleID) {
public VersionClickableNMSPacketEntity(EntityID slimeID) {
this.slimeID = slimeID;
this.vehicleID = vehicleID;
}
@Override
@ -27,26 +25,21 @@ public class VersionClickableNMSPacketEntity implements ClickableNMSPacketEntity
@Override
public void addSpawnPackets(NMSPacketList packetList, Position position) {
packetList.add(EntityLivingSpawnNMSPacket.builder(vehicleID, EntityTypeID.ARMOR_STAND, position, SLIME_Y_OFFSET)
.setArmorStandMarker()
.build()
);
packetList.add(EntityLivingSpawnNMSPacket.builder(slimeID, EntityTypeID.SLIME, position, SLIME_Y_OFFSET)
.setInvisible()
.setSlimeSmall() // Required for a correct client-side collision box
.build()
);
packetList.add(new EntityMountNMSPacket(vehicleID, slimeID));
}
@Override
public void addTeleportPackets(NMSPacketList packetList, Position position) {
packetList.add(new EntityTeleportNMSPacket(vehicleID, position, SLIME_Y_OFFSET));
packetList.add(new EntityTeleportNMSPacket(slimeID, position, SLIME_Y_OFFSET));
}
@Override
public void addDestroyPackets(NMSPacketList packetList) {
packetList.add(new EntityDestroyNMSPacket(slimeID, vehicleID));
packetList.add(new EntityDestroyNMSPacket(slimeID));
}
}

2
nms/v1_14_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_14_R1/VersionNMSManager.java
View File

@ -68,7 +68,7 @@ public class VersionNMSManager implements NMSManager {
@Override
public ClickableNMSPacketEntity newClickablePacketEntity() {
return new VersionClickableNMSPacketEntity(newEntityID(), newEntityID());
return new VersionClickableNMSPacketEntity(newEntityID());
}
@Override

14
nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/VersionClickableNMSPacketEntity.java
View File

@ -13,11 +13,9 @@ import me.filoghost.holographicdisplays.common.nms.entity.ClickableNMSPacketEnti
public class VersionClickableNMSPacketEntity implements ClickableNMSPacketEntity {
private final EntityID slimeID;
private final EntityID vehicleID;
public VersionClickableNMSPacketEntity(EntityID slimeID, EntityID vehicleID) {
public VersionClickableNMSPacketEntity(EntityID slimeID) {
this.slimeID = slimeID;
this.vehicleID = vehicleID;
}
@Override
@ -27,28 +25,22 @@ public class VersionClickableNMSPacketEntity implements ClickableNMSPacketEntity
@Override
public void addSpawnPackets(NMSPacketList packetList, Position position) {
packetList.add(new EntityLivingSpawnNMSPacket(vehicleID, EntityTypeID.ARMOR_STAND, position, SLIME_Y_OFFSET));
packetList.add(EntityMetadataNMSPacket.builder(vehicleID)
.setArmorStandMarker()
.build()
);
packetList.add(new EntityLivingSpawnNMSPacket(slimeID, EntityTypeID.SLIME, position, SLIME_Y_OFFSET));
packetList.add(EntityMetadataNMSPacket.builder(slimeID)
.setInvisible()
.setSlimeSmall() // Required for a correct client-side collision box
.build()
);
packetList.add(new EntityMountNMSPacket(vehicleID, slimeID));
}
@Override
public void addTeleportPackets(NMSPacketList packetList, Position position) {
packetList.add(new EntityTeleportNMSPacket(vehicleID, position, SLIME_Y_OFFSET));
packetList.add(new EntityTeleportNMSPacket(slimeID, position, SLIME_Y_OFFSET));
}
@Override
public void addDestroyPackets(NMSPacketList packetList) {
packetList.add(new EntityDestroyNMSPacket(slimeID, vehicleID));
packetList.add(new EntityDestroyNMSPacket(slimeID));
}
}

2
nms/v1_15_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_15_R1/VersionNMSManager.java
View File

@ -68,7 +68,7 @@ public class VersionNMSManager implements NMSManager {
@Override
public ClickableNMSPacketEntity newClickablePacketEntity() {
return new VersionClickableNMSPacketEntity(newEntityID(), newEntityID());
return new VersionClickableNMSPacketEntity(newEntityID());
}
@Override

14
nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/VersionClickableNMSPacketEntity.java
View File

@ -13,11 +13,9 @@ import me.filoghost.holographicdisplays.common.nms.entity.ClickableNMSPacketEnti
public class VersionClickableNMSPacketEntity implements ClickableNMSPacketEntity {
private final EntityID slimeID;
private final EntityID vehicleID;
public VersionClickableNMSPacketEntity(EntityID slimeID, EntityID vehicleID) {
public VersionClickableNMSPacketEntity(EntityID slimeID) {
this.slimeID = slimeID;
this.vehicleID = vehicleID;
}
@Override
@ -27,28 +25,22 @@ public class VersionClickableNMSPacketEntity implements ClickableNMSPacketEntity
@Override
public void addSpawnPackets(NMSPacketList packetList, Position position) {
packetList.add(new EntityLivingSpawnNMSPacket(vehicleID, EntityTypeID.ARMOR_STAND, position, SLIME_Y_OFFSET));
packetList.add(EntityMetadataNMSPacket.builder(vehicleID)
.setArmorStandMarker()
.build()
);
packetList.add(new EntityLivingSpawnNMSPacket(slimeID, EntityTypeID.SLIME, position, SLIME_Y_OFFSET));
packetList.add(EntityMetadataNMSPacket.builder(slimeID)
.setInvisible()
.setSlimeSmall() // Required for a correct client-side collision box
.build()
);
packetList.add(new EntityMountNMSPacket(vehicleID, slimeID));
}
@Override
public void addTeleportPackets(NMSPacketList packetList, Position position) {
packetList.add(new EntityTeleportNMSPacket(vehicleID, position, SLIME_Y_OFFSET));
packetList.add(new EntityTeleportNMSPacket(slimeID, position, SLIME_Y_OFFSET));
}
@Override
public void addDestroyPackets(NMSPacketList packetList) {
packetList.add(new EntityDestroyNMSPacket(slimeID, vehicleID));
packetList.add(new EntityDestroyNMSPacket(slimeID));
}
}

2
nms/v1_16_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R1/VersionNMSManager.java
View File

@ -68,7 +68,7 @@ public class VersionNMSManager implements NMSManager {
@Override
public ClickableNMSPacketEntity newClickablePacketEntity() {
return new VersionClickableNMSPacketEntity(newEntityID(), newEntityID());
return new VersionClickableNMSPacketEntity(newEntityID());
}
@Override

14
nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/VersionClickableNMSPacketEntity.java
View File

@ -13,11 +13,9 @@ import me.filoghost.holographicdisplays.common.nms.entity.ClickableNMSPacketEnti
public class VersionClickableNMSPacketEntity implements ClickableNMSPacketEntity {
private final EntityID slimeID;
private final EntityID vehicleID;
public VersionClickableNMSPacketEntity(EntityID slimeID, EntityID vehicleID) {
public VersionClickableNMSPacketEntity(EntityID slimeID) {
this.slimeID = slimeID;
this.vehicleID = vehicleID;
}
@Override
@ -27,28 +25,22 @@ public class VersionClickableNMSPacketEntity implements ClickableNMSPacketEntity
@Override
public void addSpawnPackets(NMSPacketList packetList, Position position) {
packetList.add(new EntityLivingSpawnNMSPacket(vehicleID, EntityTypeID.ARMOR_STAND, position, SLIME_Y_OFFSET));
packetList.add(EntityMetadataNMSPacket.builder(vehicleID)
.setArmorStandMarker()
.build()
);
packetList.add(new EntityLivingSpawnNMSPacket(slimeID, EntityTypeID.SLIME, position, SLIME_Y_OFFSET));
packetList.add(EntityMetadataNMSPacket.builder(slimeID)
.setInvisible()
.setSlimeSmall() // Required for a correct client-side collision box
.build()
);
packetList.add(new EntityMountNMSPacket(vehicleID, slimeID));
}
@Override
public void addTeleportPackets(NMSPacketList packetList, Position position) {
packetList.add(new EntityTeleportNMSPacket(vehicleID, position, SLIME_Y_OFFSET));
packetList.add(new EntityTeleportNMSPacket(slimeID, position, SLIME_Y_OFFSET));
}
@Override
public void addDestroyPackets(NMSPacketList packetList) {
packetList.add(new EntityDestroyNMSPacket(slimeID, vehicleID));
packetList.add(new EntityDestroyNMSPacket(slimeID));
}
}

2
nms/v1_16_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R2/VersionNMSManager.java
View File

@ -68,7 +68,7 @@ public class VersionNMSManager implements NMSManager {
@Override
public ClickableNMSPacketEntity newClickablePacketEntity() {
return new VersionClickableNMSPacketEntity(newEntityID(), newEntityID());
return new VersionClickableNMSPacketEntity(newEntityID());
}
@Override

14
nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/VersionClickableNMSPacketEntity.java
View File

@ -13,11 +13,9 @@ import me.filoghost.holographicdisplays.common.nms.entity.ClickableNMSPacketEnti
public class VersionClickableNMSPacketEntity implements ClickableNMSPacketEntity {
private final EntityID slimeID;
private final EntityID vehicleID;
public VersionClickableNMSPacketEntity(EntityID slimeID, EntityID vehicleID) {
public VersionClickableNMSPacketEntity(EntityID slimeID) {
this.slimeID = slimeID;
this.vehicleID = vehicleID;
}
@Override
@ -27,28 +25,22 @@ public class VersionClickableNMSPacketEntity implements ClickableNMSPacketEntity
@Override
public void addSpawnPackets(NMSPacketList packetList, Position position) {
packetList.add(new EntityLivingSpawnNMSPacket(vehicleID, EntityTypeID.ARMOR_STAND, position, SLIME_Y_OFFSET));
packetList.add(EntityMetadataNMSPacket.builder(vehicleID)
.setArmorStandMarker()
.build()
);
packetList.add(new EntityLivingSpawnNMSPacket(slimeID, EntityTypeID.SLIME, position, SLIME_Y_OFFSET));
packetList.add(EntityMetadataNMSPacket.builder(slimeID)
.setInvisible()
.setSlimeSmall() // Required for a correct client-side collision box
.build()
);
packetList.add(new EntityMountNMSPacket(vehicleID, slimeID));
}
@Override
public void addTeleportPackets(NMSPacketList packetList, Position position) {
packetList.add(new EntityTeleportNMSPacket(vehicleID, position, SLIME_Y_OFFSET));
packetList.add(new EntityTeleportNMSPacket(slimeID, position, SLIME_Y_OFFSET));
}
@Override
public void addDestroyPackets(NMSPacketList packetList) {
packetList.add(new EntityDestroyNMSPacket(slimeID, vehicleID));
packetList.add(new EntityDestroyNMSPacket(slimeID));
}
}

2
nms/v1_16_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_16_R3/VersionNMSManager.java
View File

@ -68,7 +68,7 @@ public class VersionNMSManager implements NMSManager {
@Override
public ClickableNMSPacketEntity newClickablePacketEntity() {
return new VersionClickableNMSPacketEntity(newEntityID(), newEntityID());
return new VersionClickableNMSPacketEntity(newEntityID());
}
@Override

14
nms/v1_17_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_17_R1/VersionClickableNMSPacketEntity.java
View File

@ -13,11 +13,9 @@ import me.filoghost.holographicdisplays.common.nms.entity.ClickableNMSPacketEnti
public class VersionClickableNMSPacketEntity implements ClickableNMSPacketEntity {
private final EntityID slimeID;
private final EntityID vehicleID;
public VersionClickableNMSPacketEntity(EntityID slimeID, EntityID vehicleID) {
public VersionClickableNMSPacketEntity(EntityID slimeID) {
this.slimeID = slimeID;
this.vehicleID = vehicleID;
}
@Override
@ -27,28 +25,22 @@ public class VersionClickableNMSPacketEntity implements ClickableNMSPacketEntity
@Override
public void addSpawnPackets(NMSPacketList packetList, Position position) {
packetList.add(new EntityLivingSpawnNMSPacket(vehicleID, EntityTypeID.ARMOR_STAND, position, SLIME_Y_OFFSET));
packetList.add(EntityMetadataNMSPacket.builder(vehicleID)
.setArmorStandMarker()
.build()
);
packetList.add(new EntityLivingSpawnNMSPacket(slimeID, EntityTypeID.SLIME, position, SLIME_Y_OFFSET));
packetList.add(EntityMetadataNMSPacket.builder(slimeID)
.setInvisible()
.setSlimeSmall() // Required for a correct client-side collision box
.build()
);
packetList.add(new EntityMountNMSPacket(vehicleID, slimeID));
}
@Override
public void addTeleportPackets(NMSPacketList packetList, Position position) {
packetList.add(new EntityTeleportNMSPacket(vehicleID, position, SLIME_Y_OFFSET));
packetList.add(new EntityTeleportNMSPacket(slimeID, position, SLIME_Y_OFFSET));
}
@Override
public void addDestroyPackets(NMSPacketList packetList) {
PacketHelper.addDestroyPackets(packetList, slimeID, vehicleID);
PacketHelper.addDestroyPackets(packetList, slimeID);
}
}

2
nms/v1_17_r1/src/main/java/me/filoghost/holographicdisplays/nms/v1_17_R1/VersionNMSManager.java
View File

@ -67,7 +67,7 @@ public class VersionNMSManager implements NMSManager {
@Override
public ClickableNMSPacketEntity newClickablePacketEntity() {
return new VersionClickableNMSPacketEntity(newEntityID(), newEntityID());
return new VersionClickableNMSPacketEntity(newEntityID());
}
@Override

14
nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/VersionClickableNMSPacketEntity.java
View File

@ -13,11 +13,9 @@ import me.filoghost.holographicdisplays.common.nms.entity.ClickableNMSPacketEnti
public class VersionClickableNMSPacketEntity implements ClickableNMSPacketEntity {
private final EntityID slimeID;
private final EntityID vehicleID;
public VersionClickableNMSPacketEntity(EntityID slimeID, EntityID vehicleID) {
public VersionClickableNMSPacketEntity(EntityID slimeID) {
this.slimeID = slimeID;
this.vehicleID = vehicleID;
}
@Override
@ -27,27 +25,21 @@ public class VersionClickableNMSPacketEntity implements ClickableNMSPacketEntity
@Override
public void addSpawnPackets(NMSPacketList packetList, Position position) {
packetList.add(new EntitySpawnNMSPacket(vehicleID, EntityTypeID.ARMOR_STAND, position, SLIME_Y_OFFSET));
packetList.add(EntityMetadataNMSPacket.builder(vehicleID)
.setArmorStandMarker()
.build()
);
packetList.add(EntityLivingSpawnNMSPacket.builder(slimeID, EntityTypeID.SLIME, position, SLIME_Y_OFFSET)
.setInvisible()
.setSlimeSmall() // Required for a correct client-side collision box
.build()
);
packetList.add(new EntityMountNMSPacket(vehicleID, slimeID));
}
@Override
public void addTeleportPackets(NMSPacketList packetList, Position position) {
packetList.add(new EntityTeleportNMSPacket(vehicleID, position, SLIME_Y_OFFSET));
packetList.add(new EntityTeleportNMSPacket(slimeID, position, SLIME_Y_OFFSET));
}
@Override
public void addDestroyPackets(NMSPacketList packetList) {
packetList.add(new EntityDestroyNMSPacket(slimeID, vehicleID));
packetList.add(new EntityDestroyNMSPacket(slimeID));
}
}

2
nms/v1_8_r3/src/main/java/me/filoghost/holographicdisplays/nms/v1_8_R3/VersionNMSManager.java
View File

@ -80,7 +80,7 @@ public class VersionNMSManager implements NMSManager {
@Override
public ClickableNMSPacketEntity newClickablePacketEntity() {
return new VersionClickableNMSPacketEntity(newEntityID(), newEntityID());
return new VersionClickableNMSPacketEntity(newEntityID());
}
@Override

14
nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/VersionClickableNMSPacketEntity.java
View File

@ -13,11 +13,9 @@ import me.filoghost.holographicdisplays.common.nms.entity.ClickableNMSPacketEnti
public class VersionClickableNMSPacketEntity implements ClickableNMSPacketEntity {
private final EntityID slimeID;
private final EntityID vehicleID;
public VersionClickableNMSPacketEntity(EntityID slimeID, EntityID vehicleID) {
public VersionClickableNMSPacketEntity(EntityID slimeID) {
this.slimeID = slimeID;
this.vehicleID = vehicleID;
}
@Override
@ -27,27 +25,21 @@ public class VersionClickableNMSPacketEntity implements ClickableNMSPacketEntity
@Override
public void addSpawnPackets(NMSPacketList packetList, Position position) {
packetList.add(new EntitySpawnNMSPacket(vehicleID, EntityTypeID.ARMOR_STAND, position, SLIME_Y_OFFSET));
packetList.add(EntityMetadataNMSPacket.builder(vehicleID)
.setArmorStandMarker()
.build()
);
packetList.add(EntityLivingSpawnNMSPacket.builder(slimeID, EntityTypeID.SLIME, position, SLIME_Y_OFFSET)
.setInvisible()
.setSlimeSmall() // Required for a correct client-side collision box
.build()
);
packetList.add(new EntityMountNMSPacket(vehicleID, slimeID));
}
@Override
public void addTeleportPackets(NMSPacketList packetList, Position position) {
packetList.add(new EntityTeleportNMSPacket(vehicleID, position, SLIME_Y_OFFSET));
packetList.add(new EntityTeleportNMSPacket(slimeID, position, SLIME_Y_OFFSET));
}
@Override
public void addDestroyPackets(NMSPacketList packetList) {
packetList.add(new EntityDestroyNMSPacket(slimeID, vehicleID));
packetList.add(new EntityDestroyNMSPacket(slimeID));
}
}

2
nms/v1_9_r2/src/main/java/me/filoghost/holographicdisplays/nms/v1_9_R2/VersionNMSManager.java
View File

@ -83,7 +83,7 @@ public class VersionNMSManager implements NMSManager {
@Override
public ClickableNMSPacketEntity newClickablePacketEntity() {
return new VersionClickableNMSPacketEntity(newEntityID(), newEntityID());
return new VersionClickableNMSPacketEntity(newEntityID());
}
@Override