Use PortingLibEntity.getEntitySpawningPacket

Alpha-s-Stuff · Feb 28, 2024 · 515c63c · 515c63c
1 parent 7c3fe98
commit 515c63c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/src/main/java/slimeknights/tconstruct/gadgets/entity/EflnBallEntity.java b/src/main/java/slimeknights/tconstruct/gadgets/entity/EflnBallEntity.java
@@ -1,6 +1,7 @@
 package slimeknights.tconstruct.gadgets.entity;
 
 import io.github.fabricators_of_create.porting_lib.entity.IEntityAdditionalSpawnData;
+import io.github.fabricators_of_create.porting_lib.entity.PortingLibEntity;
 import io.github.fabricators_of_create.porting_lib.event.common.ExplosionEvents;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.FriendlyByteBuf;
@@ -66,6 +67,6 @@ public void readSpawnData(FriendlyByteBuf additionalData) {
   @Nonnull
   @Override
   public Packet<ClientGamePacketListener> getAddEntityPacket() {
-    return new ClientboundAddEntityPacket(this);
+    return PortingLibEntity.getEntitySpawningPacket(this);
   }
 }
diff --git a/src/main/java/slimeknights/tconstruct/gadgets/entity/FancyItemFrameEntity.java b/src/main/java/slimeknights/tconstruct/gadgets/entity/FancyItemFrameEntity.java
@@ -1,12 +1,15 @@
 package slimeknights.tconstruct.gadgets.entity;
 
 import io.github.fabricators_of_create.porting_lib.entity.IEntityAdditionalSpawnData;
+import io.github.fabricators_of_create.porting_lib.entity.PortingLibEntity;
 import net.fabricmc.fabric.api.entity.EntityPickInteractionAware;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.chat.Component;
+import net.minecraft.network.protocol.Packet;
+import net.minecraft.network.protocol.game.ClientGamePacketListener;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.network.syncher.EntityDataSerializers;
 import net.minecraft.network.syncher.SynchedEntityData;
@@ -222,6 +225,11 @@ public void readAdditionalSaveData(CompoundTag compound) {
     }
   }
 
+  @Override
+  public Packet<ClientGamePacketListener> getAddEntityPacket() {
+    return PortingLibEntity.getEntitySpawningPacket(this);
+  }
+
   @Override
   public void writeSpawnData(FriendlyByteBuf buffer) {
     buffer.writeVarInt(this.getFrameId());

diff --git a/src/main/java/slimeknights/tconstruct/gadgets/entity/GlowballEntity.java b/src/main/java/slimeknights/tconstruct/gadgets/entity/GlowballEntity.java
@@ -1,6 +1,7 @@
 package slimeknights.tconstruct.gadgets.entity;
 
 import io.github.fabricators_of_create.porting_lib.entity.IEntityAdditionalSpawnData;
+import io.github.fabricators_of_create.porting_lib.entity.PortingLibEntity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.network.FriendlyByteBuf;
@@ -79,6 +80,6 @@ public void readSpawnData(FriendlyByteBuf additionalData) {
   @Nonnull
   @Override
   public Packet<ClientGamePacketListener> getAddEntityPacket() {
-    return new ClientboundAddEntityPacket(this);
+    return PortingLibEntity.getEntitySpawningPacket(this);
   }
 }
diff --git a/src/main/java/slimeknights/tconstruct/gadgets/entity/shuriken/ShurikenEntityBase.java b/src/main/java/slimeknights/tconstruct/gadgets/entity/shuriken/ShurikenEntityBase.java
@@ -1,6 +1,7 @@
 package slimeknights.tconstruct.gadgets.entity.shuriken;
 
 import io.github.fabricators_of_create.porting_lib.entity.IEntityAdditionalSpawnData;
+import io.github.fabricators_of_create.porting_lib.entity.PortingLibEntity;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ClientGamePacketListener;
@@ -87,6 +88,6 @@ public void readSpawnData(FriendlyByteBuf additionalData) {
   @Nonnull
   @Override
   public Packet<ClientGamePacketListener> getAddEntityPacket() {
-    return new ClientboundAddEntityPacket(this);
+    return PortingLibEntity.getEntitySpawningPacket(this);
   }
 }
diff --git a/src/main/java/slimeknights/tconstruct/library/tools/IndestructibleItemEntity.java b/src/main/java/slimeknights/tconstruct/library/tools/IndestructibleItemEntity.java
@@ -1,5 +1,6 @@
 package slimeknights.tconstruct.library.tools;
 
+import io.github.fabricators_of_create.porting_lib.entity.PortingLibEntity;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ClientGamePacketListener;
@@ -33,7 +34,7 @@ public IndestructibleItemEntity(Level worldIn, double x, double y, double z, Ite
 
   @Override
   public Packet<ClientGamePacketListener> getAddEntityPacket() {
-    return new ClientboundAddEntityPacket(this);
+    return PortingLibEntity.getEntitySpawningPacket(this);
   }
 
   /** Copies the pickup delay from another entity */