diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/DecoyEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/DecoyEntity.java index 0c0a76d6e..27690c75f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/DecoyEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/DecoyEntity.java @@ -3,7 +3,8 @@ package com.atsuishio.superbwarfare.entity.projectile; import net.minecraft.world.phys.Vec3; public interface DecoyEntity { - String getStringUUID(); + + String getDecoyUUID(); Vec3 getPosition(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/FlareDecoyEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/FlareDecoyEntity.java index 09ea28cbf..0bca9700c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/FlareDecoyEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/FlareDecoyEntity.java @@ -62,6 +62,11 @@ public class FlareDecoyEntity extends Entity implements DecoyEntity { this.xRotO = this.getXRot(); } + @Override + public String getDecoyUUID() { + return this.getStringUUID(); + } + @Override public Vec3 getPosition() { return position(); diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/JavelinMissileEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/JavelinMissileEntity.java index b5d1efa1d..f6e937a7c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/JavelinMissileEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/JavelinMissileEntity.java @@ -219,7 +219,7 @@ public class JavelinMissileEntity extends FastThrowableProjectile implements Geo for (var e : decoy) { if (e instanceof DecoyEntity decoyEntity && !distracted) { - this.entityData.set(TARGET_UUID, decoyEntity.getStringUUID()); + this.entityData.set(TARGET_UUID, decoyEntity.getDecoyUUID()); distracted = true; } } diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/SmokeDecoyEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/SmokeDecoyEntity.java index d29e10817..b4dc534ae 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/SmokeDecoyEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/SmokeDecoyEntity.java @@ -69,4 +69,9 @@ public class SmokeDecoyEntity extends Entity implements DecoyEntity { public Vec3 getPosition() { return position(); } + + @Override + public String getDecoyUUID() { + return this.getStringUUID(); + } } diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/SwarmDroneEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/SwarmDroneEntity.java index 69b8e31d9..173e2d656 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/SwarmDroneEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/SwarmDroneEntity.java @@ -197,7 +197,7 @@ public class SwarmDroneEntity extends FastThrowableProjectile implements GeoEnti for (var e : decoy) { if (e instanceof DecoyEntity decoyEntity && !distracted) { - this.entityData.set(TARGET_UUID, decoyEntity.getStringUUID()); + this.entityData.set(TARGET_UUID, decoyEntity.getDecoyUUID()); distracted = true; } } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/JavelinItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/JavelinItem.java index 7e9702359..e6669710e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/JavelinItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/JavelinItem.java @@ -122,7 +122,7 @@ public class JavelinItem extends GunItem implements GeoItem { List decoy = SeekTool.seekLivingEntities(player, player.level(), 512, 8); for (var e : decoy) { if (e instanceof DecoyEntity decoyEntity) { - tag.putString("TargetEntity", decoyEntity.getStringUUID()); + tag.putString("TargetEntity", decoyEntity.getDecoyUUID()); tag.putDouble("TargetPosX", decoyEntity.getPosition().x); tag.putDouble("TargetPosY", decoyEntity.getPosition().y); tag.putDouble("TargetPosZ", decoyEntity.getPosition().z);