Normalizes CraftEntity#toString/getHandle

paper-api/src/main/java/org/bukkit/event/entity/LingeringPotionSplashEvent.java

@@ -18,27 +18,27 @@ public class LingeringPotionSplashEvent extends ProjectileHitEvent implements Ca
 
     private static final HandlerList HANDLER_LIST = new HandlerList();
 
-    private final AreaEffectCloud entity;
+    private final AreaEffectCloud effectCloud;
     private boolean allowEmptyAreaEffectCreation;
 
     private boolean cancelled;
 
     @ApiStatus.Internal
     @Deprecated(since = "1.20.2", forRemoval = true)
-    public LingeringPotionSplashEvent(@NotNull final ThrownPotion potion, @NotNull final AreaEffectCloud entity) {
-       this(potion, null, null, null, entity);
+    public LingeringPotionSplashEvent(@NotNull final ThrownPotion potion, @NotNull final AreaEffectCloud effectCloud) {
+       this(potion, null, null, null, effectCloud);
     }
 
     @ApiStatus.Internal
-    public LingeringPotionSplashEvent(@NotNull final ThrownPotion potion, @Nullable Entity hitEntity, @Nullable Block hitBlock, @Nullable BlockFace hitFace, @NotNull final AreaEffectCloud entity) {
+    public LingeringPotionSplashEvent(@NotNull final ThrownPotion potion, @Nullable Entity hitEntity, @Nullable Block hitBlock, @Nullable BlockFace hitFace, @NotNull final AreaEffectCloud effectCloud) {
         super(potion, hitEntity, hitBlock, hitFace);
-        this.entity = entity;
+        this.effectCloud = effectCloud;
     }
 
     @NotNull
     @Override
     public ThrownPotion getEntity() {
-        return (ThrownPotion) super.getEntity();
+        return (ThrownPotion) this.entity;
     }
 
     /**
@@ -48,10 +48,9 @@ public ThrownPotion getEntity() {
      */
     @NotNull
     public AreaEffectCloud getAreaEffectCloud() {
-        return entity;
+        return effectCloud;
     }
 
-    // Paper start
     /**
      * Sets if an Empty AreaEffectCloud may be created
      *
@@ -69,7 +68,6 @@ public void allowsEmptyCreation(boolean allowEmptyAreaEffectCreation) {
     public boolean allowsEmptyCreation() {
         return allowEmptyAreaEffectCreation;
     }
-    // Paper end
 
     @Override
     public boolean isCancelled() {

paper-server/src/main/java/io/papermc/paper/entity/PaperSchoolableFish.java

@@ -13,7 +13,7 @@ public PaperSchoolableFish(CraftServer server, AbstractSchoolingFish entity) {
 
     @Override
     public AbstractSchoolingFish getHandle() {
-        return (AbstractSchoolingFish) super.getHandle();
+        return (AbstractSchoolingFish) this.entity;
     }
 
     @Override

paper-server/src/main/java/org/bukkit/craftbukkit/entity/AbstractProjectile.java

@@ -9,6 +9,11 @@ public AbstractProjectile(CraftServer server, net.minecraft.world.entity.Entity
         super(server, entity);
     }
 
+    @Override
+    public net.minecraft.world.entity.projectile.Projectile getHandle() {
+        return (net.minecraft.world.entity.projectile.Projectile) this.entity;
+    }
+
     @Override
     public boolean doesBounce() {
         return false;
@@ -53,11 +58,6 @@ public void hitEntity(org.bukkit.entity.Entity entity, org.bukkit.util.Vector ve
         this.getHandle().preHitTargetOrDeflectSelf(new net.minecraft.world.phys.EntityHitResult(((CraftEntity) entity).getHandle(), new net.minecraft.world.phys.Vec3(vector.getX(), vector.getY(), vector.getZ())));
     }
 
-    @Override
-    public net.minecraft.world.entity.projectile.Projectile getHandle() {
-        return (net.minecraft.world.entity.projectile.Projectile) entity;
-    }
-
     @Override
     public final org.bukkit.projectiles.ProjectileSource getShooter() {
         this.getHandle().refreshProjectileSource(true); // Paper - Refresh ProjectileSource for projectiles

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractArrow.java

@@ -3,6 +3,7 @@
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
+import java.util.List;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.level.BlockCollisions;
@@ -13,14 +14,18 @@
 import org.bukkit.craftbukkit.inventory.CraftItemStack;
 import org.bukkit.entity.AbstractArrow;
 import org.bukkit.inventory.ItemStack;
-import java.util.List;
 
 public abstract class CraftAbstractArrow extends AbstractProjectile implements AbstractArrow {
 
     public CraftAbstractArrow(CraftServer server, net.minecraft.world.entity.projectile.AbstractArrow entity) {
         super(server, entity);
     }
 
+    @Override
+    public net.minecraft.world.entity.projectile.AbstractArrow getHandle() {
+        return (net.minecraft.world.entity.projectile.AbstractArrow) this.entity;
+    }
+
     @Override
     public void setKnockbackStrength(int knockbackStrength) {
     }
@@ -63,8 +68,6 @@ public void setCritical(boolean critical) {
         this.getHandle().setCritArrow(critical);
     }
 
-    // Paper - moved to AbstractProjectile
-
     @Override
     public boolean isInBlock() {
         return this.getHandle().isInGround();
@@ -139,16 +142,6 @@ public void setWeapon(ItemStack item) {
         this.getHandle().firedFromWeapon = CraftItemStack.asNMSCopy(item);
     }
 
-    @Override
-    public net.minecraft.world.entity.projectile.AbstractArrow getHandle() {
-        return (net.minecraft.world.entity.projectile.AbstractArrow) this.entity;
-    }
-
-    @Override
-    public String toString() {
-        return "CraftAbstractArrow";
-    }
-
     // Paper start
     @Override
     public CraftItemStack getItemStack() {

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractCow.java

@@ -15,5 +15,4 @@ public CraftAbstractCow(CraftServer server, net.minecraft.world.entity.animal.Ab
     public net.minecraft.world.entity.animal.AbstractCow getHandle() {
         return (net.minecraft.world.entity.animal.AbstractCow) this.entity;
     }
-
 }

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractSkeleton.java

@@ -11,13 +11,13 @@ public CraftAbstractSkeleton(CraftServer server, net.minecraft.world.entity.mons
     }
 
     @Override
-    public void setSkeletonType(Skeleton.SkeletonType type) {
-        throw new UnsupportedOperationException("Not supported.");
+    public net.minecraft.world.entity.monster.AbstractSkeleton getHandle() {
+        return (net.minecraft.world.entity.monster.AbstractSkeleton) this.entity;
     }
 
     @Override
-    public net.minecraft.world.entity.monster.AbstractSkeleton getHandle() {
-        return (net.minecraft.world.entity.monster.AbstractSkeleton) super.getHandle();
+    public void setSkeletonType(Skeleton.SkeletonType type) {
+        throw new UnsupportedOperationException("Not supported.");
     }
 
     @Override

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractVillager.java

@@ -25,11 +25,6 @@ public Merchant getMerchant() {
         return this.getHandle();
     }
 
-    @Override
-    public String toString() {
-        return "CraftAbstractVillager";
-    }
-
     @Override
     public Inventory getInventory() {
         return new CraftInventory(this.getHandle().getInventory());

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractWindCharge.java

@@ -9,19 +9,14 @@ public CraftAbstractWindCharge(CraftServer server, net.minecraft.world.entity.pr
         super(server, entity);
     }
 
-    @Override
-    public void explode() {
-        this.getHandle().explode(this.getHandle().position());
-        this.getHandle().discard(EntityRemoveEvent.Cause.EXPLODE); // SPIGOT-7577 - explode doesn't discard the entity, this happens only in tick and onHitBlock
-    }
-
     @Override
     public net.minecraft.world.entity.projectile.windcharge.AbstractWindCharge getHandle() {
         return (net.minecraft.world.entity.projectile.windcharge.AbstractWindCharge) this.entity;
     }
 
     @Override
-    public String toString() {
-        return "CraftAbstractWindCharge";
+    public void explode() {
+        this.getHandle().explode(this.getHandle().position());
+        this.getHandle().discard(EntityRemoveEvent.Cause.EXPLODE); // SPIGOT-7577 - explode doesn't discard the entity, this happens only in tick and onHitBlock
     }
 }

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAgeable.java

@@ -9,6 +9,11 @@ public CraftAgeable(CraftServer server, AgeableMob entity) {
         super(server, entity);
     }
 
+    @Override
+    public AgeableMob getHandle() {
+        return (AgeableMob) this.entity;
+    }
+
     @Override
     public int getAge() {
         return this.getHandle().getAge();
@@ -62,14 +67,4 @@ public void setBreed(boolean breed) {
             this.setAge(6000);
         }
     }
-
-    @Override
-    public AgeableMob getHandle() {
-        return (AgeableMob) this.entity;
-    }
-
-    @Override
-    public String toString() {
-        return "CraftAgeable";
-    }
 }

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAllay.java

@@ -21,11 +21,6 @@ public Allay getHandle() {
         return (Allay) this.entity;
     }
 
-    @Override
-    public String toString() {
-        return "CraftAllay";
-    }
-
     @Override
     public Inventory getInventory() {
         return new CraftInventory(this.getHandle().getInventory());

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAmbient.java

@@ -13,9 +13,4 @@ public CraftAmbient(CraftServer server, AmbientCreature entity) {
     public AmbientCreature getHandle() {
         return (AmbientCreature) this.entity;
     }
-
-    @Override
-    public String toString() {
-        return "CraftAmbient";
-    }
 }

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAnimals.java

@@ -20,11 +20,6 @@ public Animal getHandle() {
         return (Animal) this.entity;
     }
 
-    @Override
-    public String toString() {
-        return "CraftAnimals";
-    }
-
     @Override
     public UUID getBreedCause() {
         return this.getHandle().loveCause;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java

@@ -30,12 +30,7 @@ public CraftAreaEffectCloud(CraftServer server, net.minecraft.world.entity.AreaE
 
     @Override
     public net.minecraft.world.entity.AreaEffectCloud getHandle() {
-        return (net.minecraft.world.entity.AreaEffectCloud) super.getHandle();
-    }
-
-    @Override
-    public String toString() {
-        return "CraftAreaEffectCloud";
+        return (net.minecraft.world.entity.AreaEffectCloud) this.entity;
     }
 
     @Override

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftArmadillo.java

@@ -13,7 +13,7 @@ public CraftArmadillo(CraftServer server, net.minecraft.world.entity.animal.arma
 
     @Override
     public net.minecraft.world.entity.animal.armadillo.Armadillo getHandle() {
-        return (net.minecraft.world.entity.animal.armadillo.Armadillo) super.getHandle();
+        return (net.minecraft.world.entity.animal.armadillo.Armadillo) this.entity;
     }
 
     @Override
@@ -38,11 +38,6 @@ public void rollOut() {
         this.getHandle().getBrain().setMemoryWithExpiry(MemoryModuleType.DANGER_DETECTED_RECENTLY, true, ArmadilloState.UNROLLING.animationDuration());
     }
 
-    @Override
-    public String toString() {
-        return "CraftArmadillo";
-    }
-
     public static State stateToBukkit(ArmadilloState state) {
         return switch (state) {
             case IDLE -> State.IDLE;

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java

@@ -15,14 +15,9 @@ public CraftArmorStand(CraftServer server, net.minecraft.world.entity.decoration
         super(server, entity);
     }
 
-    @Override
-    public String toString() {
-        return "CraftArmorStand";
-    }
-
     @Override
     public net.minecraft.world.entity.decoration.ArmorStand getHandle() {
-        return (net.minecraft.world.entity.decoration.ArmorStand) super.getHandle();
+        return (net.minecraft.world.entity.decoration.ArmorStand) this.entity;
     }
 
     @Override

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java

@@ -29,11 +29,6 @@ public net.minecraft.world.entity.projectile.Arrow getHandle() {
         return (net.minecraft.world.entity.projectile.Arrow) this.entity;
     }
 
-    @Override
-    public String toString() {
-        return "CraftArrow";
-    }
-
     @Override
     public boolean addCustomEffect(PotionEffect effect, boolean override) {
         if (this.hasCustomEffect(effect.getType())) {

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAxolotl.java

@@ -12,12 +12,7 @@ public CraftAxolotl(CraftServer server, net.minecraft.world.entity.animal.axolot
 
     @Override
     public net.minecraft.world.entity.animal.axolotl.Axolotl getHandle() {
-        return (net.minecraft.world.entity.animal.axolotl.Axolotl) super.getHandle();
-    }
-
-    @Override
-    public String toString() {
-        return "CraftAxolotl";
+        return (net.minecraft.world.entity.animal.axolotl.Axolotl) this.entity;
     }
 
     @Override

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBat.java

@@ -14,11 +14,6 @@ public net.minecraft.world.entity.ambient.Bat getHandle() {
         return (net.minecraft.world.entity.ambient.Bat) this.entity;
     }
 
-    @Override
-    public String toString() {
-        return "CraftBat";
-    }
-
     @Override
     public boolean isAwake() {
         return !this.getHandle().isResting();

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBee.java

@@ -18,11 +18,6 @@ public net.minecraft.world.entity.animal.Bee getHandle() {
         return (net.minecraft.world.entity.animal.Bee) this.entity;
     }
 
-    @Override
-    public String toString() {
-        return "CraftBee";
-    }
-
     @Override
     public Location getHive() {
         BlockPos hive = this.getHandle().getHivePos();

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBlaze.java

@@ -12,9 +12,4 @@ public CraftBlaze(CraftServer server, net.minecraft.world.entity.monster.Blaze e
     public net.minecraft.world.entity.monster.Blaze getHandle() {
         return (net.minecraft.world.entity.monster.Blaze) this.entity;
     }
-
-    @Override
-    public String toString() {
-        return "CraftBlaze";
-    }
 }

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBlockAttachedEntity.java

@@ -12,9 +12,4 @@ public CraftBlockAttachedEntity(CraftServer server, BlockAttachedEntity entity)
     public BlockAttachedEntity getHandle() {
         return (BlockAttachedEntity) this.entity;
     }
-
-    @Override
-    public String toString() {
-        return "CraftBlockAttachedEntity";
-    }
 }

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBlockDisplay.java

@@ -14,12 +14,7 @@ public CraftBlockDisplay(CraftServer server, net.minecraft.world.entity.Display.
 
     @Override
     public net.minecraft.world.entity.Display.BlockDisplay getHandle() {
-        return (net.minecraft.world.entity.Display.BlockDisplay) super.getHandle();
-    }
-
-    @Override
-    public String toString() {
-        return "CraftBlockDisplay";
+        return (net.minecraft.world.entity.Display.BlockDisplay) this.entity;
     }
 
     @Override