From bc3d946fdfaaff540118b98f0b35dadaacfade00 Mon Sep 17 00:00:00 2001 From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> Date: Thu, 1 May 2025 03:21:04 +0200 Subject: [PATCH] Normalizes CraftEntity#toString/getHandle (#12170) --- .../entity/LingeringPotionSplashEvent.java | 16 ++--- .../paper/entity/PaperSchoolableFish.java | 2 +- .../entity/AbstractProjectile.java | 10 +-- .../entity/CraftAbstractArrow.java | 19 ++---- .../craftbukkit/entity/CraftAbstractCow.java | 1 - .../entity/CraftAbstractSkeleton.java | 8 +-- .../entity/CraftAbstractVillager.java | 5 -- .../entity/CraftAbstractWindCharge.java | 11 +--- .../craftbukkit/entity/CraftAgeable.java | 15 ++--- .../bukkit/craftbukkit/entity/CraftAllay.java | 5 -- .../craftbukkit/entity/CraftAmbient.java | 5 -- .../craftbukkit/entity/CraftAnimals.java | 5 -- .../entity/CraftAreaEffectCloud.java | 7 +- .../craftbukkit/entity/CraftArmadillo.java | 7 +- .../craftbukkit/entity/CraftArmorStand.java | 7 +- .../bukkit/craftbukkit/entity/CraftArrow.java | 5 -- .../craftbukkit/entity/CraftAxolotl.java | 7 +- .../bukkit/craftbukkit/entity/CraftBat.java | 5 -- .../bukkit/craftbukkit/entity/CraftBee.java | 5 -- .../bukkit/craftbukkit/entity/CraftBlaze.java | 5 -- .../entity/CraftBlockAttachedEntity.java | 5 -- .../craftbukkit/entity/CraftBlockDisplay.java | 7 +- .../bukkit/craftbukkit/entity/CraftBoat.java | 17 ++--- .../craftbukkit/entity/CraftBogged.java | 5 -- .../craftbukkit/entity/CraftBreeze.java | 5 -- .../entity/CraftBreezeWindCharge.java | 5 -- .../bukkit/craftbukkit/entity/CraftCamel.java | 7 +- .../bukkit/craftbukkit/entity/CraftCat.java | 7 +- .../craftbukkit/entity/CraftCaveSpider.java | 5 -- .../craftbukkit/entity/CraftChestBoat.java | 5 -- .../craftbukkit/entity/CraftChestedHorse.java | 2 +- .../craftbukkit/entity/CraftChicken.java | 5 -- .../bukkit/craftbukkit/entity/CraftCod.java | 7 +- .../craftbukkit/entity/CraftComplexPart.java | 19 ++---- .../bukkit/craftbukkit/entity/CraftCow.java | 5 -- .../craftbukkit/entity/CraftCreaking.java | 5 -- .../craftbukkit/entity/CraftCreature.java | 5 -- .../craftbukkit/entity/CraftCreeper.java | 15 ++--- .../craftbukkit/entity/CraftDisplay.java | 7 +- .../craftbukkit/entity/CraftDolphin.java | 7 +- .../craftbukkit/entity/CraftDonkey.java | 5 -- .../entity/CraftDragonFireball.java | 6 +- .../craftbukkit/entity/CraftDrowned.java | 5 -- .../bukkit/craftbukkit/entity/CraftEgg.java | 6 +- .../entity/CraftElderGuardian.java | 5 -- .../craftbukkit/entity/CraftEnderCrystal.java | 16 ++--- .../craftbukkit/entity/CraftEnderDragon.java | 15 ++--- .../entity/CraftEnderDragonPart.java | 10 --- .../craftbukkit/entity/CraftEnderPearl.java | 5 -- .../craftbukkit/entity/CraftEnderSignal.java | 5 -- .../craftbukkit/entity/CraftEnderman.java | 22 +++---- .../craftbukkit/entity/CraftEndermite.java | 7 +- .../craftbukkit/entity/CraftEntity.java | 64 +++++++++---------- .../craftbukkit/entity/CraftEvoker.java | 7 +- .../craftbukkit/entity/CraftEvokerFangs.java | 7 +- .../entity/CraftExperienceOrb.java | 16 ++--- .../craftbukkit/entity/CraftFallingBlock.java | 5 -- .../craftbukkit/entity/CraftFireball.java | 16 ++--- .../craftbukkit/entity/CraftFirework.java | 5 -- .../bukkit/craftbukkit/entity/CraftFish.java | 5 -- .../craftbukkit/entity/CraftFishHook.java | 6 +- .../craftbukkit/entity/CraftFlying.java | 5 -- .../bukkit/craftbukkit/entity/CraftFox.java | 7 +- .../bukkit/craftbukkit/entity/CraftFrog.java | 5 -- .../bukkit/craftbukkit/entity/CraftGhast.java | 5 -- .../bukkit/craftbukkit/entity/CraftGiant.java | 5 -- .../entity/CraftGlowItemFrame.java | 7 +- .../craftbukkit/entity/CraftGlowSquid.java | 7 +- .../bukkit/craftbukkit/entity/CraftGoat.java | 7 +- .../bukkit/craftbukkit/entity/CraftGolem.java | 6 +- .../craftbukkit/entity/CraftGuardian.java | 7 +- .../craftbukkit/entity/CraftHanging.java | 6 +- .../craftbukkit/entity/CraftHoglin.java | 15 ++--- .../bukkit/craftbukkit/entity/CraftHorse.java | 7 +- .../craftbukkit/entity/CraftHumanEntity.java | 31 ++++----- .../bukkit/craftbukkit/entity/CraftHusk.java | 5 -- .../craftbukkit/entity/CraftIllager.java | 7 +- .../craftbukkit/entity/CraftIllusioner.java | 7 +- .../craftbukkit/entity/CraftInteraction.java | 7 +- .../craftbukkit/entity/CraftIronGolem.java | 5 -- .../bukkit/craftbukkit/entity/CraftItem.java | 5 -- .../craftbukkit/entity/CraftItemDisplay.java | 7 +- .../craftbukkit/entity/CraftItemFrame.java | 16 ++--- .../entity/CraftLargeFireball.java | 12 ++-- .../bukkit/craftbukkit/entity/CraftLeash.java | 16 ++--- .../entity/CraftLightningStrike.java | 16 ++--- .../craftbukkit/entity/CraftLivingEntity.java | 19 ++---- .../bukkit/craftbukkit/entity/CraftLlama.java | 8 +-- .../craftbukkit/entity/CraftLlamaSpit.java | 7 +- .../craftbukkit/entity/CraftMagmaCube.java | 5 -- .../craftbukkit/entity/CraftMarker.java | 7 +- .../craftbukkit/entity/CraftMinecart.java | 12 ++-- .../entity/CraftMinecartChest.java | 6 +- .../entity/CraftMinecartCommand.java | 6 +- .../entity/CraftMinecartFurnace.java | 6 +- .../entity/CraftMinecartHopper.java | 12 ++-- .../entity/CraftMinecartMobSpawner.java | 20 +++--- .../entity/CraftMinecartRideable.java | 10 +-- .../craftbukkit/entity/CraftMinecartTNT.java | 20 +++--- .../bukkit/craftbukkit/entity/CraftMob.java | 45 +++++++------ .../craftbukkit/entity/CraftMonster.java | 5 -- .../bukkit/craftbukkit/entity/CraftMule.java | 5 -- .../craftbukkit/entity/CraftMushroomCow.java | 17 ++--- .../craftbukkit/entity/CraftOcelot.java | 6 +- .../entity/CraftOminousItemSpawner.java | 5 -- .../craftbukkit/entity/CraftPainting.java | 15 ++--- .../bukkit/craftbukkit/entity/CraftPanda.java | 7 +- .../craftbukkit/entity/CraftParrot.java | 6 -- .../craftbukkit/entity/CraftPhantom.java | 7 +- .../bukkit/craftbukkit/entity/CraftPig.java | 17 ++--- .../craftbukkit/entity/CraftPigZombie.java | 15 ++--- .../craftbukkit/entity/CraftPiglin.java | 15 ++--- .../entity/CraftPiglinAbstract.java | 10 +-- .../craftbukkit/entity/CraftPiglinBrute.java | 7 +- .../craftbukkit/entity/CraftPillager.java | 7 +- .../craftbukkit/entity/CraftPlayer.java | 55 +++++++--------- .../craftbukkit/entity/CraftPolarBear.java | 6 +- .../craftbukkit/entity/CraftProjectile.java | 6 +- .../craftbukkit/entity/CraftPufferFish.java | 7 +- .../craftbukkit/entity/CraftRabbit.java | 5 -- .../craftbukkit/entity/CraftRaider.java | 7 +- .../craftbukkit/entity/CraftRavager.java | 7 +- .../craftbukkit/entity/CraftSalmon.java | 7 +- .../bukkit/craftbukkit/entity/CraftSheep.java | 16 ++--- .../craftbukkit/entity/CraftShulker.java | 5 -- .../entity/CraftShulkerBullet.java | 15 ++--- .../craftbukkit/entity/CraftSilverfish.java | 6 +- .../entity/CraftSizedFireball.java | 10 +-- .../craftbukkit/entity/CraftSkeleton.java | 15 ++--- .../entity/CraftSkeletonHorse.java | 9 +-- .../bukkit/craftbukkit/entity/CraftSlime.java | 15 ++--- .../entity/CraftSmallFireball.java | 6 +- .../craftbukkit/entity/CraftSniffer.java | 7 +- .../craftbukkit/entity/CraftSnowball.java | 6 +- .../craftbukkit/entity/CraftSnowman.java | 16 ++--- .../entity/CraftSpectralArrow.java | 5 -- .../craftbukkit/entity/CraftSpellcaster.java | 8 +-- .../craftbukkit/entity/CraftSpider.java | 5 -- .../bukkit/craftbukkit/entity/CraftSquid.java | 5 -- .../bukkit/craftbukkit/entity/CraftStray.java | 5 -- .../craftbukkit/entity/CraftStrider.java | 15 ++--- .../craftbukkit/entity/CraftTNTPrimed.java | 15 ++--- .../craftbukkit/entity/CraftTadpole.java | 5 -- .../entity/CraftTameableAnimal.java | 8 +-- .../craftbukkit/entity/CraftTextDisplay.java | 7 +- .../entity/CraftThrowableProjectile.java | 10 +-- .../entity/CraftThrownExpBottle.java | 6 +- .../entity/CraftThrownLingeringPotion.java | 10 +-- .../craftbukkit/entity/CraftThrownPotion.java | 10 +-- .../entity/CraftThrownSplashPotion.java | 10 +-- .../craftbukkit/entity/CraftTraderLlama.java | 7 +- .../craftbukkit/entity/CraftTrident.java | 7 +- .../craftbukkit/entity/CraftTropicalFish.java | 5 -- .../craftbukkit/entity/CraftTurtle.java | 7 +- .../craftbukkit/entity/CraftVehicle.java | 6 +- .../bukkit/craftbukkit/entity/CraftVex.java | 7 +- .../craftbukkit/entity/CraftVillager.java | 5 -- .../entity/CraftVillagerZombie.java | 7 +- .../craftbukkit/entity/CraftVindicator.java | 7 +- .../entity/CraftWanderingTrader.java | 5 -- .../craftbukkit/entity/CraftWarden.java | 5 -- .../craftbukkit/entity/CraftWaterMob.java | 5 -- .../craftbukkit/entity/CraftWindCharge.java | 6 +- .../bukkit/craftbukkit/entity/CraftWitch.java | 8 +-- .../craftbukkit/entity/CraftWither.java | 5 -- .../entity/CraftWitherSkeleton.java | 5 -- .../craftbukkit/entity/CraftWitherSkull.java | 16 ++--- .../bukkit/craftbukkit/entity/CraftWolf.java | 11 ++-- .../craftbukkit/entity/CraftZoglin.java | 15 ++--- .../craftbukkit/entity/CraftZombie.java | 5 -- .../craftbukkit/entity/CraftZombieHorse.java | 5 -- .../inventory/CraftMerchantCustom.java | 5 -- 172 files changed, 413 insertions(+), 1174 deletions(-) diff --git a/paper-api/src/main/java/org/bukkit/event/entity/LingeringPotionSplashEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/LingeringPotionSplashEvent.java index 85ecbfd6fc..41b953a1c1 100644 --- a/paper-api/src/main/java/org/bukkit/event/entity/LingeringPotionSplashEvent.java +++ b/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 class LingeringPotionSplashEvent extends ProjectileHitEvent implements Ca */ @NotNull public AreaEffectCloud getAreaEffectCloud() { - return entity; + return effectCloud; } - // Paper start /** * Sets if an Empty AreaEffectCloud may be created * @@ -69,7 +68,6 @@ public class LingeringPotionSplashEvent extends ProjectileHitEvent implements Ca public boolean allowsEmptyCreation() { return allowEmptyAreaEffectCreation; } - // Paper end @Override public boolean isCancelled() { diff --git a/paper-server/src/main/java/io/papermc/paper/entity/PaperSchoolableFish.java b/paper-server/src/main/java/io/papermc/paper/entity/PaperSchoolableFish.java index 41bf71d116..04c8213ae6 100644 --- a/paper-server/src/main/java/io/papermc/paper/entity/PaperSchoolableFish.java +++ b/paper-server/src/main/java/io/papermc/paper/entity/PaperSchoolableFish.java @@ -13,7 +13,7 @@ public class PaperSchoolableFish extends CraftFish implements SchoolableFish { @Override public AbstractSchoolingFish getHandle() { - return (AbstractSchoolingFish) super.getHandle(); + return (AbstractSchoolingFish) this.entity; } @Override diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/AbstractProjectile.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/AbstractProjectile.java index e8d82054d1..8244b7eaca 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/AbstractProjectile.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/AbstractProjectile.java @@ -9,6 +9,11 @@ public abstract class AbstractProjectile extends CraftEntity implements Projecti 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 abstract class AbstractProjectile extends CraftEntity implements Projecti 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 diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractArrow.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractArrow.java index 41dad052db..b8bfb6636b 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractArrow.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractArrow.java @@ -3,6 +3,7 @@ package org.bukkit.craftbukkit.entity; 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,7 +14,6 @@ import org.bukkit.craftbukkit.block.CraftBlock; 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 { @@ -21,6 +21,11 @@ public abstract class CraftAbstractArrow extends AbstractProjectile implements A 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 abstract class CraftAbstractArrow extends AbstractProjectile implements A this.getHandle().setCritArrow(critical); } - // Paper - moved to AbstractProjectile - @Override public boolean isInBlock() { return this.getHandle().isInGround(); @@ -139,16 +142,6 @@ public abstract class CraftAbstractArrow extends AbstractProjectile implements A 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() { diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractCow.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractCow.java index 32563d9b07..4ee1cc51e9 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractCow.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractCow.java @@ -15,5 +15,4 @@ public abstract class CraftAbstractCow extends CraftAnimals implements AbstractC public net.minecraft.world.entity.animal.AbstractCow getHandle() { return (net.minecraft.world.entity.animal.AbstractCow) this.entity; } - } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractSkeleton.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractSkeleton.java index 31d349d8ce..f59fdd04d9 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractSkeleton.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractSkeleton.java @@ -11,13 +11,13 @@ public abstract class CraftAbstractSkeleton extends CraftMonster implements Abst } @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 diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractVillager.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractVillager.java index fbdde28b3f..11a72607c4 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractVillager.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractVillager.java @@ -25,11 +25,6 @@ public abstract class CraftAbstractVillager extends CraftAgeable implements Craf return this.getHandle(); } - @Override - public String toString() { - return "CraftAbstractVillager"; - } - @Override public Inventory getInventory() { return new CraftInventory(this.getHandle().getInventory()); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractWindCharge.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractWindCharge.java index 59df9031e8..df1e31c60f 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractWindCharge.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractWindCharge.java @@ -9,19 +9,14 @@ public abstract class CraftAbstractWindCharge extends CraftFireball implements A 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 } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAgeable.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAgeable.java index 6101339a7d..809639b79d 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAgeable.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAgeable.java @@ -9,6 +9,11 @@ public class CraftAgeable extends CraftCreature implements Ageable { super(server, entity); } + @Override + public AgeableMob getHandle() { + return (AgeableMob) this.entity; + } + @Override public int getAge() { return this.getHandle().getAge(); @@ -62,14 +67,4 @@ public class CraftAgeable extends CraftCreature implements Ageable { this.setAge(6000); } } - - @Override - public AgeableMob getHandle() { - return (AgeableMob) this.entity; - } - - @Override - public String toString() { - return "CraftAgeable"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAllay.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAllay.java index c64918175e..3c1f25507b 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAllay.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAllay.java @@ -21,11 +21,6 @@ public class CraftAllay extends CraftCreature implements org.bukkit.entity.Allay return (Allay) this.entity; } - @Override - public String toString() { - return "CraftAllay"; - } - @Override public Inventory getInventory() { return new CraftInventory(this.getHandle().getInventory()); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAmbient.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAmbient.java index 2a2f9f0907..2cf667d8fa 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAmbient.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAmbient.java @@ -13,9 +13,4 @@ public class CraftAmbient extends CraftMob implements Ambient { public AmbientCreature getHandle() { return (AmbientCreature) this.entity; } - - @Override - public String toString() { - return "CraftAmbient"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAnimals.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAnimals.java index ab42bc721d..9bd90d0589 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAnimals.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAnimals.java @@ -20,11 +20,6 @@ public class CraftAnimals extends CraftAgeable implements Animals { return (Animal) this.entity; } - @Override - public String toString() { - return "CraftAnimals"; - } - @Override public UUID getBreedCause() { return this.getHandle().loveCause; diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java index 205f5b0227..30dea480db 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAreaEffectCloud.java @@ -30,12 +30,7 @@ public class CraftAreaEffectCloud extends CraftEntity implements AreaEffectCloud @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 diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftArmadillo.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftArmadillo.java index e039bc3356..2b52654e8f 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftArmadillo.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftArmadillo.java @@ -13,7 +13,7 @@ public class CraftArmadillo extends CraftAnimals implements Armadillo { @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 class CraftArmadillo extends CraftAnimals implements Armadillo { 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; diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java index 0a51414def..e8371e5153 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java @@ -15,14 +15,9 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand { 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 diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java index 980a042cb7..7926dca4e4 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java @@ -29,11 +29,6 @@ public class CraftArrow extends CraftAbstractArrow implements Arrow { 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())) { diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAxolotl.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAxolotl.java index 7f98720542..a77124dfb9 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAxolotl.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAxolotl.java @@ -12,12 +12,7 @@ public class CraftAxolotl extends CraftAnimals implements Axolotl, io.papermc.pa @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 diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBat.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBat.java index 8b943de2b1..7b29d31272 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBat.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBat.java @@ -14,11 +14,6 @@ public class CraftBat extends CraftAmbient implements Bat { return (net.minecraft.world.entity.ambient.Bat) this.entity; } - @Override - public String toString() { - return "CraftBat"; - } - @Override public boolean isAwake() { return !this.getHandle().isResting(); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBee.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBee.java index bfc2ab243d..820564c88d 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBee.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBee.java @@ -18,11 +18,6 @@ public class CraftBee extends CraftAnimals implements Bee { return (net.minecraft.world.entity.animal.Bee) this.entity; } - @Override - public String toString() { - return "CraftBee"; - } - @Override public Location getHive() { BlockPos hive = this.getHandle().getHivePos(); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBlaze.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBlaze.java index a4c9c73691..afd698a2f7 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBlaze.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBlaze.java @@ -12,9 +12,4 @@ public class CraftBlaze extends CraftMonster implements Blaze { public net.minecraft.world.entity.monster.Blaze getHandle() { return (net.minecraft.world.entity.monster.Blaze) this.entity; } - - @Override - public String toString() { - return "CraftBlaze"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBlockAttachedEntity.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBlockAttachedEntity.java index 5b0dd9aae3..1ccb370e7b 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBlockAttachedEntity.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBlockAttachedEntity.java @@ -12,9 +12,4 @@ public class CraftBlockAttachedEntity extends CraftEntity { public BlockAttachedEntity getHandle() { return (BlockAttachedEntity) this.entity; } - - @Override - public String toString() { - return "CraftBlockAttachedEntity"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBlockDisplay.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBlockDisplay.java index dd91de8f24..6502c0622e 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBlockDisplay.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBlockDisplay.java @@ -14,12 +14,7 @@ public class CraftBlockDisplay extends CraftDisplay implements BlockDisplay { @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 diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java index 72d7367598..aba0a70af9 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java @@ -1,12 +1,10 @@ package org.bukkit.craftbukkit.entity; -import java.util.stream.Collectors; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.vehicle.AbstractBoat; import org.bukkit.TreeSpecies; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.entity.Boat; -import org.bukkit.entity.Entity; public abstract class CraftBoat extends CraftVehicle implements Boat, io.papermc.paper.entity.PaperLeashable { // Paper - Leashable API @@ -14,6 +12,11 @@ public abstract class CraftBoat extends CraftVehicle implements Boat, io.papermc super(server, entity); } + @Override + public AbstractBoat getHandle() { + return (AbstractBoat) this.entity; + } + @Override public TreeSpecies getWoodType() { return CraftBoat.getTreeSpecies(this.getHandle().getType()); @@ -99,16 +102,6 @@ public abstract class CraftBoat extends CraftVehicle implements Boat, io.papermc return CraftBoat.boatStatusFromNms(this.getHandle().status); } - @Override - public AbstractBoat getHandle() { - return (AbstractBoat) this.entity; - } - - @Override - public String toString() { - return "CraftBoat{boatType=" + this.getBoatType() + ",status=" + this.getStatus() + ",passengers=" + this.getPassengers().stream().map(Entity::toString).collect(Collectors.joining("-", "{", "}")) + "}"; - } - public static Boat.Type boatTypeFromNms(EntityType boatType) { if (boatType == EntityType.OAK_BOAT || boatType == EntityType.OAK_CHEST_BOAT) { return Type.OAK; diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBogged.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBogged.java index e8e4704304..3db0be03f4 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBogged.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBogged.java @@ -15,11 +15,6 @@ public class CraftBogged extends CraftAbstractSkeleton implements Bogged, io.pap return (net.minecraft.world.entity.monster.Bogged) this.entity; } - @Override - public String toString() { - return "CraftBogged"; - } - @Override public Skeleton.SkeletonType getSkeletonType() { return Skeleton.SkeletonType.BOGGED; diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBreeze.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBreeze.java index 7648e2c700..f71864abb9 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBreeze.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBreeze.java @@ -22,9 +22,4 @@ public class CraftBreeze extends CraftMonster implements Breeze { net.minecraft.world.entity.LivingEntity entityLivingTarget = (target instanceof CraftLivingEntity craftLivingEntity) ? craftLivingEntity.getHandle() : null; this.getHandle().getBrain().setMemory(MemoryModuleType.ATTACK_TARGET, entityLivingTarget); // SPIGOT-7957: We need override memory for set target and trigger attack behaviours } - - @Override - public String toString() { - return "CraftBreeze"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBreezeWindCharge.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBreezeWindCharge.java index e88e52a9b8..59dd963689 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBreezeWindCharge.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBreezeWindCharge.java @@ -12,9 +12,4 @@ public class CraftBreezeWindCharge extends CraftAbstractWindCharge implements Br public net.minecraft.world.entity.projectile.windcharge.BreezeWindCharge getHandle() { return (net.minecraft.world.entity.projectile.windcharge.BreezeWindCharge) this.entity; } - - @Override - public String toString() { - return "CraftBreezeWindCharge"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCamel.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCamel.java index 80e571c977..93d7fde684 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCamel.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCamel.java @@ -13,12 +13,7 @@ public class CraftCamel extends CraftAbstractHorse implements Camel { @Override public net.minecraft.world.entity.animal.camel.Camel getHandle() { - return (net.minecraft.world.entity.animal.camel.Camel) super.getHandle(); - } - - @Override - public String toString() { - return "CraftCamel"; + return (net.minecraft.world.entity.animal.camel.Camel) this.entity; } @Override diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCat.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCat.java index 70619f6cd6..6026597479 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCat.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCat.java @@ -20,12 +20,7 @@ public class CraftCat extends CraftTameableAnimal implements Cat { @Override public net.minecraft.world.entity.animal.Cat getHandle() { - return (net.minecraft.world.entity.animal.Cat) super.getHandle(); - } - - @Override - public String toString() { - return "CraftCat"; + return (net.minecraft.world.entity.animal.Cat) this.entity; } @Override diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCaveSpider.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCaveSpider.java index 4f661fbdb8..79907f9027 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCaveSpider.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCaveSpider.java @@ -12,9 +12,4 @@ public class CraftCaveSpider extends CraftSpider implements CaveSpider { public net.minecraft.world.entity.monster.CaveSpider getHandle() { return (net.minecraft.world.entity.monster.CaveSpider) this.entity; } - - @Override - public String toString() { - return "CraftCaveSpider"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftChestBoat.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftChestBoat.java index 8a022e2c19..22ea11d7ad 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftChestBoat.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftChestBoat.java @@ -18,11 +18,6 @@ public abstract class CraftChestBoat extends CraftBoat implements org.bukkit.ent return (AbstractChestBoat) this.entity; } - @Override - public String toString() { - return "CraftChestBoat"; - } - @Override public Inventory getInventory() { return this.inventory; diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftChestedHorse.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftChestedHorse.java index 40ee96e31d..d05897695f 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftChestedHorse.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftChestedHorse.java @@ -12,7 +12,7 @@ public abstract class CraftChestedHorse extends CraftAbstractHorse implements Ch @Override public AbstractChestedHorse getHandle() { - return (AbstractChestedHorse) super.getHandle(); + return (AbstractChestedHorse) this.entity; } @Override diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftChicken.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftChicken.java index 9210c84bb0..ec6e42a617 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftChicken.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftChicken.java @@ -22,11 +22,6 @@ public class CraftChicken extends CraftAnimals implements Chicken { return (net.minecraft.world.entity.animal.Chicken) this.entity; } - @Override - public String toString() { - return "CraftChicken"; - } - @Override public Variant getVariant() { return CraftVariant.minecraftHolderToBukkit(this.getHandle().getVariant()); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCod.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCod.java index 63e6b07e3b..ca8c10cca8 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCod.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCod.java @@ -11,11 +11,6 @@ public class CraftCod extends io.papermc.paper.entity.PaperSchoolableFish implem @Override public net.minecraft.world.entity.animal.Cod getHandle() { - return (net.minecraft.world.entity.animal.Cod) super.getHandle(); - } - - @Override - public String toString() { - return "CraftCod"; + return (net.minecraft.world.entity.animal.Cod) this.entity; } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexPart.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexPart.java index c2583982d8..178cadf023 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexPart.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexPart.java @@ -1,20 +1,25 @@ package org.bukkit.craftbukkit.entity; import net.minecraft.world.entity.boss.EnderDragonPart; -import net.minecraft.world.entity.boss.enderdragon.EnderDragon; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.entity.ComplexEntityPart; import org.bukkit.entity.ComplexLivingEntity; import org.bukkit.event.entity.EntityDamageEvent; public class CraftComplexPart extends CraftEntity implements ComplexEntityPart { + public CraftComplexPart(CraftServer server, EnderDragonPart entity) { super(server, entity); } + @Override + public EnderDragonPart getHandle() { + return (EnderDragonPart) this.entity; + } + @Override public ComplexLivingEntity getParent() { - return (ComplexLivingEntity) ((EnderDragon) this.getHandle().parentMob).getBukkitEntity(); + return (ComplexLivingEntity) this.getHandle().parentMob.getBukkitEntity(); } @Override @@ -31,14 +36,4 @@ public class CraftComplexPart extends CraftEntity implements ComplexEntityPart { public boolean isValid() { return this.getParent().isValid(); } - - @Override - public EnderDragonPart getHandle() { - return (EnderDragonPart) this.entity; - } - - @Override - public String toString() { - return "CraftComplexPart"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCow.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCow.java index faf6f62041..d21aa1b8b1 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCow.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCow.java @@ -22,11 +22,6 @@ public class CraftCow extends CraftAbstractCow implements Cow { return (net.minecraft.world.entity.animal.Cow) this.entity; } - @Override - public String toString() { - return "CraftCow"; - } - @Override public Variant getVariant() { return CraftVariant.minecraftHolderToBukkit(this.getHandle().getVariant()); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCreaking.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCreaking.java index d9b7ad7f3b..ebdf5c7df9 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCreaking.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCreaking.java @@ -43,9 +43,4 @@ public class CraftCreaking extends CraftMonster implements org.bukkit.entity.Cre public boolean isActive() { return this.getHandle().isActive(); } - - @Override - public String toString() { - return "CraftCreaking"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCreature.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCreature.java index 664d9c1793..c99c1d36eb 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCreature.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCreature.java @@ -13,9 +13,4 @@ public class CraftCreature extends CraftMob implements Creature { public PathfinderMob getHandle() { return (PathfinderMob) this.entity; } - - @Override - public String toString() { - return "CraftCreature"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java index 42dd26b917..2fa2811c3a 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java @@ -12,6 +12,11 @@ public class CraftCreeper extends CraftMonster implements Creeper { super(server, entity); } + @Override + public net.minecraft.world.entity.monster.Creeper getHandle() { + return (net.minecraft.world.entity.monster.Creeper) this.entity; + } + @Override public boolean isPowered() { return this.getHandle().isPowered(); @@ -92,16 +97,6 @@ public class CraftCreeper extends CraftMonster implements Creeper { return (this.getHandle().entityIgniter != null) ? this.getHandle().entityIgniter.getBukkitEntity() : null; } - @Override - public net.minecraft.world.entity.monster.Creeper getHandle() { - return (net.minecraft.world.entity.monster.Creeper) this.entity; - } - - @Override - public String toString() { - return "CraftCreeper"; - } - // Paper start @Override public void setIgnited(boolean ignited) { diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftDisplay.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftDisplay.java index 48eeb1d9ba..90dcaf8e60 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftDisplay.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftDisplay.java @@ -14,12 +14,7 @@ public class CraftDisplay extends CraftEntity implements Display { @Override public net.minecraft.world.entity.Display getHandle() { - return (net.minecraft.world.entity.Display) super.getHandle(); - } - - @Override - public String toString() { - return "CraftDisplay"; + return (net.minecraft.world.entity.Display) this.entity; } @Override diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftDolphin.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftDolphin.java index 7222365af4..0400e181e4 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftDolphin.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftDolphin.java @@ -13,12 +13,7 @@ public class CraftDolphin extends CraftAgeable implements Dolphin { @Override public net.minecraft.world.entity.animal.Dolphin getHandle() { - return (net.minecraft.world.entity.animal.Dolphin) super.getHandle(); - } - - @Override - public String toString() { - return "CraftDolphin"; + return (net.minecraft.world.entity.animal.Dolphin) this.entity; } @Override diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftDonkey.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftDonkey.java index 955a1c92a9..85820f25d7 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftDonkey.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftDonkey.java @@ -10,11 +10,6 @@ public class CraftDonkey extends CraftChestedHorse implements Donkey { super(server, entity); } - @Override - public String toString() { - return "CraftDonkey"; - } - @Override public Variant getVariant() { return Variant.DONKEY; diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftDragonFireball.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftDragonFireball.java index b884c6b080..00b4487b10 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftDragonFireball.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftDragonFireball.java @@ -4,12 +4,8 @@ import org.bukkit.craftbukkit.CraftServer; import org.bukkit.entity.DragonFireball; public class CraftDragonFireball extends CraftFireball implements DragonFireball { + public CraftDragonFireball(CraftServer server, net.minecraft.world.entity.projectile.DragonFireball entity) { super(server, entity); } - - @Override - public String toString() { - return "CraftDragonFireball"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftDrowned.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftDrowned.java index 51fc4acae9..4dfed6e60c 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftDrowned.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftDrowned.java @@ -13,9 +13,4 @@ public class CraftDrowned extends CraftZombie implements Drowned, com.destroysto public net.minecraft.world.entity.monster.Drowned getHandle() { return (net.minecraft.world.entity.monster.Drowned) this.entity; } - - @Override - public String toString() { - return "CraftDrowned"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEgg.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEgg.java index 010e9e922a..6b1c6e0239 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEgg.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEgg.java @@ -5,6 +5,7 @@ import org.bukkit.craftbukkit.CraftServer; import org.bukkit.entity.Egg; public class CraftEgg extends CraftThrowableProjectile implements Egg { + public CraftEgg(CraftServer server, ThrownEgg entity) { super(server, entity); } @@ -13,9 +14,4 @@ public class CraftEgg extends CraftThrowableProjectile implements Egg { public ThrownEgg getHandle() { return (ThrownEgg) this.entity; } - - @Override - public String toString() { - return "CraftEgg"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftElderGuardian.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftElderGuardian.java index 0e5d7ba2a3..7cd75b7ea2 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftElderGuardian.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftElderGuardian.java @@ -9,11 +9,6 @@ public class CraftElderGuardian extends CraftGuardian implements ElderGuardian { super(server, entity); } - @Override - public String toString() { - return "CraftElderGuardian"; - } - @Override public boolean isElder() { return true; diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderCrystal.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderCrystal.java index 8ebd824e74..2229a03fda 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderCrystal.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderCrystal.java @@ -8,10 +8,16 @@ import org.bukkit.craftbukkit.util.CraftLocation; import org.bukkit.entity.EnderCrystal; public class CraftEnderCrystal extends CraftEntity implements EnderCrystal { + public CraftEnderCrystal(CraftServer server, EndCrystal entity) { super(server, entity); } + @Override + public EndCrystal getHandle() { + return (EndCrystal) this.entity; + } + @Override public boolean isShowingBottom() { return this.getHandle().showsBottom(); @@ -38,14 +44,4 @@ public class CraftEnderCrystal extends CraftEntity implements EnderCrystal { this.getHandle().setBeamTarget(CraftLocation.toBlockPosition(location)); } } - - @Override - public EndCrystal getHandle() { - return (EndCrystal) this.entity; - } - - @Override - public String toString() { - return "CraftEnderCrystal"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java index 82b28b2e8e..a716433db4 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java @@ -20,6 +20,11 @@ public class CraftEnderDragon extends CraftMob implements EnderDragon, CraftEnem super(server, entity); } + @Override + public net.minecraft.world.entity.boss.enderdragon.EnderDragon getHandle() { + return (net.minecraft.world.entity.boss.enderdragon.EnderDragon) this.entity; + } + @Override public Set getParts() { Builder builder = ImmutableSet.builder(); @@ -31,16 +36,6 @@ public class CraftEnderDragon extends CraftMob implements EnderDragon, CraftEnem return builder.build(); } - @Override - public net.minecraft.world.entity.boss.enderdragon.EnderDragon getHandle() { - return (net.minecraft.world.entity.boss.enderdragon.EnderDragon) this.entity; - } - - @Override - public String toString() { - return "CraftEnderDragon"; - } - @Override public Phase getPhase() { return Phase.values()[this.getHandle().getEntityData().get(net.minecraft.world.entity.boss.enderdragon.EnderDragon.DATA_PHASE)]; diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragonPart.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragonPart.java index 05a6fc957c..9d7268b6b4 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragonPart.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragonPart.java @@ -16,16 +16,6 @@ public class CraftEnderDragonPart extends CraftComplexPart implements EnderDrago return (EnderDragon) super.getParent(); } - @Override - public net.minecraft.world.entity.boss.EnderDragonPart getHandle() { - return (net.minecraft.world.entity.boss.EnderDragonPart) this.entity; - } - - @Override - public String toString() { - return "CraftEnderDragonPart"; - } - @Override public void damage(double amount, DamageSource damageSource) { this.getParent().damage(amount, damageSource); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderPearl.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderPearl.java index 3bb8d74f2b..eb7e63d569 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderPearl.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderPearl.java @@ -13,9 +13,4 @@ public class CraftEnderPearl extends CraftThrowableProjectile implements EnderPe public ThrownEnderpearl getHandle() { return (ThrownEnderpearl) this.entity; } - - @Override - public String toString() { - return "CraftEnderPearl"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderSignal.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderSignal.java index 27f56fa4b7..7feea819b2 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderSignal.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderSignal.java @@ -20,11 +20,6 @@ public class CraftEnderSignal extends CraftEntity implements EnderSignal { return (EyeOfEnder) this.entity; } - @Override - public String toString() { - return "CraftEnderSignal"; - } - @Override public Location getTargetLocation() { return new Location(this.getWorld(), this.getHandle().tx, this.getHandle().ty, this.getHandle().tz, this.getHandle().getYRot(), this.getHandle().getXRot()); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java index 59195000ea..52a5240b7a 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java @@ -13,11 +13,21 @@ import org.bukkit.entity.Entity; import org.bukkit.material.MaterialData; public class CraftEnderman extends CraftMonster implements Enderman { + public CraftEnderman(CraftServer server, EnderMan entity) { super(server, entity); } - @Override public boolean teleportRandomly() { return getHandle().teleport(); } // Paper + @Override + public EnderMan getHandle() { + return (EnderMan) this.entity; + } + + @Override + public boolean teleportRandomly() { + return getHandle().teleport(); + } + @Override public MaterialData getCarriedMaterial() { BlockState blockData = this.getHandle().getCarriedBlock(); @@ -60,16 +70,6 @@ public class CraftEnderman extends CraftMonster implements Enderman { this.getHandle().setHasBeenStaredAt(hasBeenStaredAt); } - @Override - public EnderMan getHandle() { - return (EnderMan) this.entity; - } - - @Override - public String toString() { - return "CraftEnderman"; - } - @Override public boolean teleport() { return this.getHandle().teleport(); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java index 4d5958405e..000c5ea5d3 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java @@ -11,12 +11,7 @@ public class CraftEndermite extends CraftMonster implements Endermite { @Override public net.minecraft.world.entity.monster.Endermite getHandle() { - return (net.minecraft.world.entity.monster.Endermite) super.getHandle(); - } - - @Override - public String toString() { - return "CraftEndermite"; + return (net.minecraft.world.entity.monster.Endermite) this.entity; } @Override diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java index c8caeba773..cd145edc45 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -124,6 +124,38 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { throw new AssertionError("Unknown entity " + (entity == null ? null : entity.getClass())); } + public Entity getHandle() { + return this.entity; + } + + public Entity getHandleRaw() { + return this.entity; + } + + public void setHandle(final Entity entity) { + this.entity = entity; + } + + @Override + public String toString() { + return this.getClass().getSimpleName() + "{uuid=" + this.getUniqueId() + '}'; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (obj == null || getClass() != obj.getClass()) return false; + + final CraftEntity other = (CraftEntity) obj; + return this.entity == other.entity; // There should never be duplicate entities with differing references + } + + @Override + public int hashCode() { + // The UUID and thus hash code should never change (unlike the entity id) + return this.getUniqueId().hashCode(); + } + @Override public Location getLocation() { return CraftLocation.toBukkit(this.entity.position(), this.getWorld(), this.entity.getBukkitYaw(), this.entity.getXRot()); @@ -524,14 +556,6 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { this.getHandle().totalEntityAge = value; } - public Entity getHandle() { - return this.entity; - } - - public Entity getHandleRaw() { - return this.entity; - } - @Override public final EntityType getType() { return this.entityType; @@ -561,30 +585,6 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { return CraftSound.minecraftToBukkit(this.getHandle().getSwimHighSpeedSplashSound()); } - public void setHandle(final Entity entity) { - this.entity = entity; - } - - @Override - public String toString() { - return "CraftEntity{" + "id=" + this.getEntityId() + '}'; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) return true; - if (obj == null || getClass() != obj.getClass()) return false; - - final CraftEntity other = (CraftEntity) obj; - return this.entity == other.entity; // There should never be duplicate entities with differing references - } - - @Override - public int hashCode() { - // The UUID and thus hash code should never change (unlike the entity id) - return this.getUniqueId().hashCode(); - } - @Override public void setMetadata(String metadataKey, MetadataValue newMetadataValue) { this.server.getEntityMetadata().setMetadata(this, metadataKey, newMetadataValue); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java index 64efbf845f..73b5013670 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java @@ -13,12 +13,7 @@ public class CraftEvoker extends CraftSpellcaster implements Evoker { @Override public net.minecraft.world.entity.monster.Evoker getHandle() { - return (net.minecraft.world.entity.monster.Evoker) super.getHandle(); - } - - @Override - public String toString() { - return "CraftEvoker"; + return (net.minecraft.world.entity.monster.Evoker) this.entity; } @Override diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEvokerFangs.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEvokerFangs.java index 19b368cc86..5bf6f079a1 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEvokerFangs.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEvokerFangs.java @@ -13,12 +13,7 @@ public class CraftEvokerFangs extends CraftEntity implements EvokerFangs { @Override public net.minecraft.world.entity.projectile.EvokerFangs getHandle() { - return (net.minecraft.world.entity.projectile.EvokerFangs) super.getHandle(); - } - - @Override - public String toString() { - return "CraftEvokerFangs"; + return (net.minecraft.world.entity.projectile.EvokerFangs) this.entity; } @Override diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java index a3dfa081ff..8cd7ba2f4b 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java @@ -5,10 +5,16 @@ import org.bukkit.entity.ExperienceOrb; import java.util.UUID; public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb { + public CraftExperienceOrb(CraftServer server, net.minecraft.world.entity.ExperienceOrb entity) { super(server, entity); } + @Override + public net.minecraft.world.entity.ExperienceOrb getHandle() { + return (net.minecraft.world.entity.ExperienceOrb) this.entity; + } + @Override public int getExperience() { return this.getHandle().getValue(); @@ -43,14 +49,4 @@ public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb { public SpawnReason getSpawnReason() { return this.getHandle().spawnReason; } - - @Override - public net.minecraft.world.entity.ExperienceOrb getHandle() { - return (net.minecraft.world.entity.ExperienceOrb) this.entity; - } - - @Override - public String toString() { - return "CraftExperienceOrb"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java index 93a33c9ce6..eacdc2467f 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java @@ -19,11 +19,6 @@ public class CraftFallingBlock extends CraftEntity implements FallingBlock { return (FallingBlockEntity) this.entity; } - @Override - public String toString() { - return "CraftFallingBlock"; - } - @Override public Material getMaterial() { return this.getBlockData().getMaterial(); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java index 74190127ed..7e53e12c8e 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java @@ -9,10 +9,16 @@ import org.bukkit.util.Vector; import org.jetbrains.annotations.NotNull; public class CraftFireball extends AbstractProjectile implements Fireball { + public CraftFireball(CraftServer server, AbstractHurtingProjectile entity) { super(server, entity); } + @Override + public AbstractHurtingProjectile getHandle() { + return (AbstractHurtingProjectile) this.entity; + } + @Override public float getYield() { return this.getHandle().bukkitYield; @@ -78,14 +84,4 @@ public class CraftFireball extends AbstractProjectile implements Fireball { return this.getAcceleration(); } // Paper end - Expose power on fireball projectiles - - @Override - public AbstractHurtingProjectile getHandle() { - return (AbstractHurtingProjectile) this.entity; - } - - @Override - public String toString() { - return "CraftFireball"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java index a9ffd363b5..c64e78d548 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java @@ -23,11 +23,6 @@ public class CraftFirework extends CraftProjectile implements Firework { return (FireworkRocketEntity) this.entity; } - @Override - public String toString() { - return "CraftFirework"; - } - @Override public FireworkMeta getFireworkMeta() { return (FireworkMeta) CraftItemStack.getItemMeta(this.getHandle().getEntityData().get(FireworkRocketEntity.DATA_ID_FIREWORKS_ITEM), org.bukkit.inventory.ItemType.FIREWORK_ROCKET); // Paper - Expose firework item directly diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java index eb10f94d5e..207f06a854 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java @@ -14,9 +14,4 @@ public class CraftFish extends CraftWaterMob implements Fish, io.papermc.paper.e public AbstractFish getHandle() { return (AbstractFish) this.entity; } - - @Override - public String toString() { - return "CraftFish"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java index 5f7225f180..327a686a20 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java @@ -14,6 +14,7 @@ import org.bukkit.entity.FishHook; import org.bukkit.inventory.EquipmentSlot; public class CraftFishHook extends CraftProjectile implements FishHook { + private double biteChance = -1; public CraftFishHook(CraftServer server, FishingHook entity) { @@ -25,11 +26,6 @@ public class CraftFishHook extends CraftProjectile implements FishHook { return (FishingHook) this.entity; } - @Override - public String toString() { - return "CraftFishingHook"; - } - @Override public int getMinWaitTime() { return this.getHandle().minWaitTime; diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFlying.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFlying.java index 8117faa0c8..974ed7be3f 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFlying.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFlying.java @@ -14,9 +14,4 @@ public class CraftFlying extends CraftMob implements Flying { public FlyingMob getHandle() { return (FlyingMob) this.entity; } - - @Override - public String toString() { - return "CraftFlying"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java index 0aefbba2d3..8084bd6788 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java @@ -17,12 +17,7 @@ public class CraftFox extends CraftAnimals implements Fox { @Override public net.minecraft.world.entity.animal.Fox getHandle() { - return (net.minecraft.world.entity.animal.Fox) super.getHandle(); - } - - @Override - public String toString() { - return "CraftFox"; + return (net.minecraft.world.entity.animal.Fox) this.entity; } @Override diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFrog.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFrog.java index d8c28fb3cd..f4de532f28 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFrog.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFrog.java @@ -23,11 +23,6 @@ public class CraftFrog extends CraftAnimals implements org.bukkit.entity.Frog { return (Frog) this.entity; } - @Override - public String toString() { - return "CraftFrog"; - } - @Override public Entity getTongueTarget() { return this.getHandle().getTongueTarget().map(net.minecraft.world.entity.Entity::getBukkitEntity).orElse(null); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGhast.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGhast.java index 692b35b25d..7ae83ee68f 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGhast.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGhast.java @@ -14,11 +14,6 @@ public class CraftGhast extends CraftFlying implements Ghast, CraftEnemy { return (net.minecraft.world.entity.monster.Ghast) this.entity; } - @Override - public String toString() { - return "CraftGhast"; - } - @Override public boolean isCharging() { return this.getHandle().isCharging(); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGiant.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGiant.java index 5826205339..84c1dc9bc1 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGiant.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGiant.java @@ -13,9 +13,4 @@ public class CraftGiant extends CraftMonster implements Giant { public net.minecraft.world.entity.monster.Giant getHandle() { return (net.minecraft.world.entity.monster.Giant) this.entity; } - - @Override - public String toString() { - return "CraftGiant"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGlowItemFrame.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGlowItemFrame.java index b9a7576d24..b41bd05158 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGlowItemFrame.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGlowItemFrame.java @@ -11,11 +11,6 @@ public class CraftGlowItemFrame extends CraftItemFrame implements GlowItemFrame @Override public net.minecraft.world.entity.decoration.GlowItemFrame getHandle() { - return (net.minecraft.world.entity.decoration.GlowItemFrame) super.getHandle(); - } - - @Override - public String toString() { - return "CraftGlowItemFrame{item=" + this.getItem() + ", rotation=" + this.getRotation() + "}"; + return (net.minecraft.world.entity.decoration.GlowItemFrame) this.entity; } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGlowSquid.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGlowSquid.java index 253a0d2f98..dac2ac14a1 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGlowSquid.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGlowSquid.java @@ -12,12 +12,7 @@ public class CraftGlowSquid extends CraftSquid implements GlowSquid { @Override public net.minecraft.world.entity.GlowSquid getHandle() { - return (net.minecraft.world.entity.GlowSquid) super.getHandle(); - } - - @Override - public String toString() { - return "CraftGlowSquid"; + return (net.minecraft.world.entity.GlowSquid) this.entity; } @Override diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGoat.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGoat.java index d4f3370e2b..1fcab60ca6 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGoat.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGoat.java @@ -11,12 +11,7 @@ public class CraftGoat extends CraftAnimals implements Goat { @Override public net.minecraft.world.entity.animal.goat.Goat getHandle() { - return (net.minecraft.world.entity.animal.goat.Goat) super.getHandle(); - } - - @Override - public String toString() { - return "CraftGoat"; + return (net.minecraft.world.entity.animal.goat.Goat) this.entity; } @Override diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGolem.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGolem.java index e27e469894..9cb3dd093f 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGolem.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGolem.java @@ -5,6 +5,7 @@ import org.bukkit.craftbukkit.CraftServer; import org.bukkit.entity.Golem; public class CraftGolem extends CraftCreature implements Golem { + public CraftGolem(CraftServer server, AbstractGolem entity) { super(server, entity); } @@ -13,9 +14,4 @@ public class CraftGolem extends CraftCreature implements Golem { public AbstractGolem getHandle() { return (AbstractGolem) this.entity; } - - @Override - public String toString() { - return "CraftGolem"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGuardian.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGuardian.java index e232350f2c..2f68d87081 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGuardian.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGuardian.java @@ -15,12 +15,7 @@ public class CraftGuardian extends CraftMonster implements Guardian { @Override public net.minecraft.world.entity.monster.Guardian getHandle() { - return (net.minecraft.world.entity.monster.Guardian) super.getHandle(); - } - - @Override - public String toString() { - return "CraftGuardian"; + return (net.minecraft.world.entity.monster.Guardian) this.entity; } @Override diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHanging.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHanging.java index f1e3f2b89b..49f5d3113c 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHanging.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHanging.java @@ -8,6 +8,7 @@ import org.bukkit.craftbukkit.block.CraftBlock; import org.bukkit.entity.Hanging; public class CraftHanging extends CraftBlockAttachedEntity implements Hanging { + public CraftHanging(CraftServer server, HangingEntity entity) { super(server, entity); } @@ -61,9 +62,4 @@ public class CraftHanging extends CraftBlockAttachedEntity implements Hanging { public HangingEntity getHandle() { return (HangingEntity) this.entity; } - - @Override - public String toString() { - return "CraftHanging"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHoglin.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHoglin.java index 37007775d2..9565572393 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHoglin.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHoglin.java @@ -10,6 +10,11 @@ public class CraftHoglin extends CraftAnimals implements Hoglin, CraftEnemy { super(server, entity); } + @Override + public net.minecraft.world.entity.monster.hoglin.Hoglin getHandle() { + return (net.minecraft.world.entity.monster.hoglin.Hoglin) this.entity; + } + @Override public boolean isImmuneToZombification() { return this.getHandle().isImmuneToZombification(); @@ -50,14 +55,4 @@ public class CraftHoglin extends CraftAnimals implements Hoglin, CraftEnemy { public boolean isConverting() { return this.getHandle().isConverting(); } - - @Override - public net.minecraft.world.entity.monster.hoglin.Hoglin getHandle() { - return (net.minecraft.world.entity.monster.hoglin.Hoglin) this.entity; - } - - @Override - public String toString() { - return "CraftHoglin"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHorse.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHorse.java index 045e2ac4fb..ef8073dfd4 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHorse.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHorse.java @@ -16,7 +16,7 @@ public class CraftHorse extends CraftAbstractHorse implements Horse { @Override public net.minecraft.world.entity.animal.horse.Horse getHandle() { - return (net.minecraft.world.entity.animal.horse.Horse) super.getHandle(); + return (net.minecraft.world.entity.animal.horse.Horse) this.entity; } @Override @@ -63,9 +63,4 @@ public class CraftHorse extends CraftAbstractHorse implements Horse { this.getHandle().createEquipmentSlotContainer(EquipmentSlot.SADDLE) ); } - - @Override - public String toString() { - return "CraftHorse{variant=" + this.getVariant() + ", owner=" + this.getOwner() + '}'; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java index 6ad1c2220b..934eb5c668 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -80,6 +80,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { + private CraftInventoryPlayer inventory; private final CraftInventory enderChest; protected final PermissibleBase perm = new PermissibleBase(this); @@ -93,6 +94,21 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { this.enderChest = new CraftInventory(entity.getEnderChestInventory()); } + @Override + public Player getHandle() { + return (Player) this.entity; + } + + public void setHandle(final Player entity) { + super.setHandle(entity); + this.inventory = new CraftInventoryPlayer(entity.getInventory()); + } + + @Override + public String toString() { + return this.getClass().getSimpleName() + "{name=" + this.getName() + ", uuid=" + this.getUniqueId() + '}'; + } + @Override public PlayerInventory getInventory() { return this.inventory; @@ -304,21 +320,6 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { this.mode = mode; } - @Override - public Player getHandle() { - return (Player) this.entity; - } - - public void setHandle(final Player entity) { - super.setHandle(entity); - this.inventory = new CraftInventoryPlayer(entity.getInventory()); - } - - @Override - public String toString() { - return "CraftHumanEntity{" + "id=" + this.getEntityId() + "name=" + this.getName() + '}'; - } - @Override public InventoryView getOpenInventory() { return this.getHandle().containerMenu.getBukkitView(); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHusk.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHusk.java index 4822c744cc..43be612359 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHusk.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHusk.java @@ -8,9 +8,4 @@ public class CraftHusk extends CraftZombie implements Husk { public CraftHusk(CraftServer server, net.minecraft.world.entity.monster.Husk entity) { super(server, entity); } - - @Override - public String toString() { - return "CraftHusk"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftIllager.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftIllager.java index fb3c518f02..fdc42e00b2 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftIllager.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftIllager.java @@ -12,11 +12,6 @@ public class CraftIllager extends CraftRaider implements Illager { @Override public AbstractIllager getHandle() { - return (AbstractIllager) super.getHandle(); - } - - @Override - public String toString() { - return "CraftIllager"; + return (AbstractIllager) this.entity; } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java index 5b2af80e58..ed158e3a11 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java @@ -11,11 +11,6 @@ public class CraftIllusioner extends CraftSpellcaster implements Illusioner, com @Override public net.minecraft.world.entity.monster.Illusioner getHandle() { - return (net.minecraft.world.entity.monster.Illusioner) super.getHandle(); - } - - @Override - public String toString() { - return "CraftIllusioner"; + return (net.minecraft.world.entity.monster.Illusioner) this.entity; } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftInteraction.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftInteraction.java index caa3016bf9..c4f2be2c47 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftInteraction.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftInteraction.java @@ -14,12 +14,7 @@ public class CraftInteraction extends CraftEntity implements Interaction { @Override public net.minecraft.world.entity.Interaction getHandle() { - return (net.minecraft.world.entity.Interaction) super.getHandle(); - } - - @Override - public String toString() { - return "CraftInteraction"; + return (net.minecraft.world.entity.Interaction) this.entity; } @Override diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java index 63cae1a2e9..2d7be6f2af 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java @@ -13,11 +13,6 @@ public class CraftIronGolem extends CraftGolem implements IronGolem { return (net.minecraft.world.entity.animal.IronGolem) this.entity; } - @Override - public String toString() { - return "CraftIronGolem"; - } - @Override public boolean isPlayerCreated() { return this.getHandle().isPlayerCreated(); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java index cef51ad02f..ca656d97a0 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java @@ -143,9 +143,4 @@ public class CraftItem extends CraftEntity implements Item { public UUID getThrower() { return this.getHandle().thrower; } - - @Override - public String toString() { - return "CraftItem"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItemDisplay.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItemDisplay.java index 787f91566f..41c3e5182e 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItemDisplay.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItemDisplay.java @@ -15,12 +15,7 @@ public class CraftItemDisplay extends CraftDisplay implements ItemDisplay { @Override public net.minecraft.world.entity.Display.ItemDisplay getHandle() { - return (net.minecraft.world.entity.Display.ItemDisplay) super.getHandle(); - } - - @Override - public String toString() { - return "CraftItemDisplay"; + return (net.minecraft.world.entity.Display.ItemDisplay) this.entity; } @Override diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java index 981527d4a8..31aa6d0c2d 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java @@ -12,10 +12,16 @@ import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.entity.ItemFrame; public class CraftItemFrame extends CraftHanging implements ItemFrame { + public CraftItemFrame(CraftServer server, net.minecraft.world.entity.decoration.ItemFrame entity) { super(server, entity); } + @Override + public net.minecraft.world.entity.decoration.ItemFrame getHandle() { + return (net.minecraft.world.entity.decoration.ItemFrame) this.entity; + } + @Override public boolean setFacingDirection(BlockFace face, boolean force) { HangingEntity hanging = this.getHandle(); @@ -150,14 +156,4 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame { public void setFixed(boolean fixed) { this.getHandle().fixed = fixed; } - - @Override - public net.minecraft.world.entity.decoration.ItemFrame getHandle() { - return (net.minecraft.world.entity.decoration.ItemFrame) this.entity; - } - - @Override - public String toString() { - return "CraftItemFrame{item=" + this.getItem() + ", rotation=" + this.getRotation() + "}"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLargeFireball.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLargeFireball.java index 0848963e61..742c022796 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLargeFireball.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLargeFireball.java @@ -4,23 +4,19 @@ import org.bukkit.craftbukkit.CraftServer; import org.bukkit.entity.LargeFireball; public class CraftLargeFireball extends CraftSizedFireball implements LargeFireball { + public CraftLargeFireball(CraftServer server, net.minecraft.world.entity.projectile.LargeFireball entity) { super(server, entity); } - @Override - public void setYield(float yield) { - super.setYield(yield); - this.getHandle().explosionPower = (int) yield; - } - @Override public net.minecraft.world.entity.projectile.LargeFireball getHandle() { return (net.minecraft.world.entity.projectile.LargeFireball) this.entity; } @Override - public String toString() { - return "CraftLargeFireball"; + public void setYield(float yield) { + super.setYield(yield); + this.getHandle().explosionPower = (int) yield; } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLeash.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLeash.java index 76a7fc3d6c..9022661233 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLeash.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLeash.java @@ -7,10 +7,16 @@ import org.bukkit.craftbukkit.CraftServer; import org.bukkit.entity.LeashHitch; public class CraftLeash extends CraftBlockAttachedEntity implements LeashHitch { + public CraftLeash(CraftServer server, LeashFenceKnotEntity entity) { super(server, entity); } + @Override + public LeashFenceKnotEntity getHandle() { + return (LeashFenceKnotEntity) this.entity; + } + @Override public boolean setFacingDirection(BlockFace face, boolean force) { Preconditions.checkArgument(face == BlockFace.SELF, "%s is not a valid facing direction", face); @@ -34,14 +40,4 @@ public class CraftLeash extends CraftBlockAttachedEntity implements LeashHitch { public void setFacingDirection(BlockFace face) { // Leash hitch has no facing direction } - - @Override - public LeashFenceKnotEntity getHandle() { - return (LeashFenceKnotEntity) this.entity; - } - - @Override - public String toString() { - return "CraftLeash"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java index 533e16e306..32e426513f 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java @@ -7,10 +7,16 @@ import org.bukkit.entity.LightningStrike; import org.bukkit.entity.Player; public class CraftLightningStrike extends CraftEntity implements LightningStrike { + public CraftLightningStrike(final CraftServer server, final LightningBolt entity) { super(server, entity); } + @Override + public LightningBolt getHandle() { + return (LightningBolt) this.entity; + } + @Override public boolean isEffect() { return this.getHandle().isEffect; // Paper - Properly handle lightning effects api @@ -41,16 +47,6 @@ public class CraftLightningStrike extends CraftEntity implements LightningStrike this.getHandle().setCause((player != null) ? ((CraftPlayer) player).getHandle() : null); } - @Override - public LightningBolt getHandle() { - return (LightningBolt) this.entity; - } - - @Override - public String toString() { - return "CraftLightningStrike"; - } - // Spigot start private final LightningStrike.Spigot spigot = new LightningStrike.Spigot() { diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java index 478bb11e1a..ff8987ca8f 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -107,6 +107,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { } } + @Override + public net.minecraft.world.entity.LivingEntity getHandle() { + return (net.minecraft.world.entity.LivingEntity) this.entity; + } + @Override public double getHealth() { return Math.min(Math.max(0, this.getHandle().getHealth()), this.getMaxHealth()); @@ -503,20 +508,6 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { this.getHandle().setNoActionTime(ticks); } - @Override - public net.minecraft.world.entity.LivingEntity getHandle() { - return (net.minecraft.world.entity.LivingEntity) this.entity; - } - - public void setHandle(final net.minecraft.world.entity.LivingEntity entity) { - super.setHandle(entity); - } - - @Override - public String toString() { - return "CraftLivingEntity{" + "id=" + this.getEntityId() + '}'; - } - @Override public Player getKiller() { return Optionull.map(this.getHandle().getLastHurtByPlayer(), player -> (Player) player.getBukkitEntity()); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java index 9aaaf2fc6a..02deb9c372 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java @@ -6,7 +6,6 @@ import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.inventory.CraftInventoryLlama; import org.bukkit.entity.Horse; import org.bukkit.entity.Llama; -import org.bukkit.entity.Llama.Color; import org.bukkit.inventory.LlamaInventory; public class CraftLlama extends CraftChestedHorse implements Llama, com.destroystokyo.paper.entity.CraftRangedEntity { // Paper @@ -17,7 +16,7 @@ public class CraftLlama extends CraftChestedHorse implements Llama, com.destroys @Override public net.minecraft.world.entity.animal.horse.Llama getHandle() { - return (net.minecraft.world.entity.animal.horse.Llama) super.getHandle(); + return (net.minecraft.world.entity.animal.horse.Llama) this.entity; } @Override @@ -58,11 +57,6 @@ public class CraftLlama extends CraftChestedHorse implements Llama, com.destroys return Horse.Variant.LLAMA; } - @Override - public String toString() { - return "CraftLlama"; - } - @Override public boolean inCaravan() { return this.getHandle().inCaravan(); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLlamaSpit.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLlamaSpit.java index 7207c2f06a..1425190d51 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLlamaSpit.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLlamaSpit.java @@ -11,11 +11,6 @@ public class CraftLlamaSpit extends AbstractProjectile implements LlamaSpit { @Override public net.minecraft.world.entity.projectile.LlamaSpit getHandle() { - return (net.minecraft.world.entity.projectile.LlamaSpit) super.getHandle(); - } - - @Override - public String toString() { - return "CraftLlamaSpit"; + return (net.minecraft.world.entity.projectile.LlamaSpit) this.entity; } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMagmaCube.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMagmaCube.java index 58b638ffd3..8720425ea9 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMagmaCube.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMagmaCube.java @@ -13,9 +13,4 @@ public class CraftMagmaCube extends CraftSlime implements MagmaCube { public net.minecraft.world.entity.monster.MagmaCube getHandle() { return (net.minecraft.world.entity.monster.MagmaCube) this.entity; } - - @Override - public String toString() { - return "CraftMagmaCube"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMarker.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMarker.java index e6782a48d2..9a9302fe56 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMarker.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMarker.java @@ -11,11 +11,6 @@ public class CraftMarker extends CraftEntity implements Marker { @Override public net.minecraft.world.entity.Marker getHandle() { - return (net.minecraft.world.entity.Marker) super.getHandle(); - } - - @Override - public String toString() { - return "CraftMarker"; + return (net.minecraft.world.entity.Marker) this.entity; } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java index 2828cd3f9f..9c5caa4b9c 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java @@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity; import com.google.common.base.Preconditions; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.vehicle.AbstractMinecart; -import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; import org.bukkit.Material; import org.bukkit.block.data.BlockData; @@ -16,10 +15,16 @@ import org.bukkit.util.Vector; import java.util.Optional; public abstract class CraftMinecart extends CraftVehicle implements Minecart { + public CraftMinecart(CraftServer server, AbstractMinecart entity) { super(server, entity); } + @Override + public AbstractMinecart getHandle() { + return (AbstractMinecart) this.entity; + } + @Override public void setDamage(double damage) { this.getHandle().setDamage((float) damage); @@ -79,11 +84,6 @@ public abstract class CraftMinecart extends CraftVehicle implements Minecart { } // Paper end - @Override - public AbstractMinecart getHandle() { - return (AbstractMinecart) this.entity; - } - @Override public void setDisplayBlock(MaterialData material) { this.getHandle().setCustomDisplayBlockState(Optional.ofNullable(material).map(CraftMagicNumbers::getBlock)); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java index 10cb6046dc..0a3581cdc5 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java @@ -7,6 +7,7 @@ import org.bukkit.entity.minecart.StorageMinecart; import org.bukkit.inventory.Inventory; public class CraftMinecartChest extends CraftMinecartContainer implements StorageMinecart, com.destroystokyo.paper.loottable.PaperLootableEntityInventory { // Paper + private final CraftInventory inventory; public CraftMinecartChest(CraftServer server, MinecartChest entity) { @@ -18,9 +19,4 @@ public class CraftMinecartChest extends CraftMinecartContainer implements Storag public Inventory getInventory() { return this.inventory; } - - @Override - public String toString() { - return "CraftMinecartChest{" + "inventory=" + this.inventory + '}'; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java index 663c1909e2..4279824f8a 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java @@ -14,6 +14,7 @@ import org.bukkit.permissions.PermissionAttachmentInfo; import org.bukkit.plugin.Plugin; public class CraftMinecartCommand extends CraftMinecart implements CommandMinecart, io.papermc.paper.commands.PaperCommandBlockHolder { + private final PermissibleBase perm = new PermissibleBase(this); public CraftMinecartCommand(CraftServer server, MinecartCommandBlock entity) { @@ -41,11 +42,6 @@ public class CraftMinecartCommand extends CraftMinecart implements CommandMineca this.getHandle().getCommandBlock().setCustomName(CraftChatMessage.fromStringOrNull(name)); } - @Override - public String toString() { - return "CraftMinecartCommand"; - } - @Override public void sendMessage(String message) { } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartFurnace.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartFurnace.java index 561b27472b..65d808c2b0 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartFurnace.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartFurnace.java @@ -6,6 +6,7 @@ import org.bukkit.craftbukkit.CraftServer; import org.bukkit.entity.minecart.PoweredMinecart; public class CraftMinecartFurnace extends CraftMinecart implements PoweredMinecart { + public CraftMinecartFurnace(CraftServer server, MinecartFurnace entity) { super(server, entity); } @@ -47,9 +48,4 @@ public class CraftMinecartFurnace extends CraftMinecart implements PoweredMineca final net.minecraft.world.phys.Vec3 push = this.getHandle().push; this.getHandle().push = new net.minecraft.world.phys.Vec3(push.x, push.y, zPush); } - - @Override - public String toString() { - return "CraftMinecartFurnace"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java index 700624a128..7933ee5f73 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java @@ -6,7 +6,8 @@ import org.bukkit.craftbukkit.inventory.CraftInventory; import org.bukkit.entity.minecart.HopperMinecart; import org.bukkit.inventory.Inventory; -public final class CraftMinecartHopper extends CraftMinecartContainer implements HopperMinecart, com.destroystokyo.paper.loottable.PaperLootableEntityInventory { // Paper +public class CraftMinecartHopper extends CraftMinecartContainer implements HopperMinecart, com.destroystokyo.paper.loottable.PaperLootableEntityInventory { // Paper + private final CraftInventory inventory; public CraftMinecartHopper(CraftServer server, MinecartHopper entity) { @@ -15,8 +16,8 @@ public final class CraftMinecartHopper extends CraftMinecartContainer implements } @Override - public String toString() { - return "CraftMinecartHopper{" + "inventory=" + this.inventory + '}'; + public net.minecraft.world.entity.vehicle.MinecartHopper getHandle() { + return (net.minecraft.world.entity.vehicle.MinecartHopper) this.entity; } @Override @@ -34,11 +35,6 @@ public final class CraftMinecartHopper extends CraftMinecartContainer implements this.getHandle().setEnabled(enabled); } - @Override - public net.minecraft.world.entity.vehicle.MinecartHopper getHandle() { - return (net.minecraft.world.entity.vehicle.MinecartHopper) super.getHandle(); - } - @Override public int getPickupCooldown() { throw new UnsupportedOperationException("Hopper minecarts don't have cooldowns"); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartMobSpawner.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartMobSpawner.java index 40b62dd462..704635f202 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartMobSpawner.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartMobSpawner.java @@ -16,11 +16,17 @@ import org.bukkit.entity.EntitySnapshot; import org.bukkit.entity.EntityType; import org.bukkit.entity.minecart.SpawnerMinecart; -final class CraftMinecartMobSpawner extends CraftMinecart implements SpawnerMinecart, org.bukkit.craftbukkit.spawner.PaperSharedSpawnerLogic { // Paper - more spawner API - CraftMinecartMobSpawner(CraftServer server, MinecartSpawner entity) { +public class CraftMinecartMobSpawner extends CraftMinecart implements SpawnerMinecart, org.bukkit.craftbukkit.spawner.PaperSharedSpawnerLogic { // Paper - more spawner API + + public CraftMinecartMobSpawner(CraftServer server, MinecartSpawner entity) { super(server, entity); } + @Override + public MinecartSpawner getHandle() { + return (MinecartSpawner) this.entity; + } + @Override public EntityType getSpawnedType() { SpawnData spawnData = this.getHandle().getSpawner().nextSpawnData; @@ -162,16 +168,6 @@ final class CraftMinecartMobSpawner extends CraftMinecart implements SpawnerMine this.getHandle().getSpawner().spawnRange = spawnRange; } - @Override - public MinecartSpawner getHandle() { - return (MinecartSpawner) this.entity; - } - - @Override - public String toString() { - return "CraftMinecartMobSpawner"; - } - @Override public net.minecraft.world.level.BaseSpawner getSpawner() { return this.getHandle().getSpawner(); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartRideable.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartRideable.java index 2f8c3f907e..a043737f03 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartRideable.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartRideable.java @@ -1,16 +1,12 @@ package org.bukkit.craftbukkit.entity; -import net.minecraft.world.entity.vehicle.AbstractMinecart; +import net.minecraft.world.entity.vehicle.Minecart; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.entity.minecart.RideableMinecart; public class CraftMinecartRideable extends CraftMinecart implements RideableMinecart { - public CraftMinecartRideable(CraftServer server, AbstractMinecart entity) { + + public CraftMinecartRideable(CraftServer server, Minecart entity) { super(server, entity); } - - @Override - public String toString() { - return "CraftMinecartRideable"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartTNT.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartTNT.java index 1fdf9e9bed..bbe67e82a2 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartTNT.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartTNT.java @@ -6,11 +6,17 @@ import net.minecraft.world.entity.vehicle.MinecartTNT; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.entity.minecart.ExplosiveMinecart; -public final class CraftMinecartTNT extends CraftMinecart implements ExplosiveMinecart { - CraftMinecartTNT(CraftServer server, MinecartTNT entity) { +public class CraftMinecartTNT extends CraftMinecart implements ExplosiveMinecart { + + public CraftMinecartTNT(CraftServer server, MinecartTNT entity) { super(server, entity); } + @Override + public MinecartTNT getHandle() { + return (MinecartTNT) this.entity; + } + @Override public float getYield() { return this.getHandle().explosionPowerBase; @@ -72,14 +78,4 @@ public final class CraftMinecartTNT extends CraftMinecart implements ExplosiveMi this.getHandle().explode(power); } - - @Override - public MinecartTNT getHandle() { - return (MinecartTNT) super.getHandle(); - } - - @Override - public String toString() { - return "CraftMinecartTNT"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java index 2c8ec3a30e..e2e7743bde 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java @@ -12,13 +12,30 @@ import org.bukkit.entity.Mob; import org.bukkit.loot.LootTable; public abstract class CraftMob extends CraftLivingEntity implements Mob, io.papermc.paper.entity.PaperLeashable { // Paper - Leashable API - public CraftMob(CraftServer server, net.minecraft.world.entity.Mob entity) { - super(server, entity); - paperPathfinder = new com.destroystokyo.paper.entity.PaperPathfinder(entity); // Paper - Mob Pathfinding API - } private final com.destroystokyo.paper.entity.PaperPathfinder paperPathfinder; // Paper - Mob Pathfinding API - @Override public com.destroystokyo.paper.entity.Pathfinder getPathfinder() { return paperPathfinder; } // Paper - Mob Pathfinding API + + public CraftMob(CraftServer server, net.minecraft.world.entity.Mob entity) { + super(server, entity); + this.paperPathfinder = new com.destroystokyo.paper.entity.PaperPathfinder(entity); // Paper - Mob Pathfinding API + } + + @Override + public net.minecraft.world.entity.Mob getHandle() { + return (net.minecraft.world.entity.Mob) this.entity; + } + + @Override + public void setHandle(net.minecraft.world.entity.Entity entity) { + super.setHandle(entity); + this.paperPathfinder.setHandle(getHandle()); + } + + @Override + public com.destroystokyo.paper.entity.Pathfinder getPathfinder() { + return this.paperPathfinder; + } + @Override public void setTarget(LivingEntity target) { Preconditions.checkState(!this.getHandle().generation, "Cannot set target during world generation"); @@ -54,24 +71,6 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob, io.pape return (sound != null) ? CraftSound.minecraftToBukkit(sound) : null; } - @Override - public net.minecraft.world.entity.Mob getHandle() { - return (net.minecraft.world.entity.Mob) this.entity; - } - - // Paper start - Mob Pathfinding API - @Override - public void setHandle(net.minecraft.world.entity.Entity entity) { - super.setHandle(entity); - paperPathfinder.setHandle(getHandle()); - } - // Paper end - Mob Pathfinding API - - @Override - public String toString() { - return "CraftMob"; - } - @Override public void setLootTable(LootTable table) { this.getHandle().lootTable = Optional.ofNullable(CraftLootTable.bukkitToMinecraft(table)); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMonster.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMonster.java index 706c74c832..52c165714a 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMonster.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMonster.java @@ -13,9 +13,4 @@ public class CraftMonster extends CraftCreature implements Monster, CraftEnemy { public net.minecraft.world.entity.monster.Monster getHandle() { return (net.minecraft.world.entity.monster.Monster) this.entity; } - - @Override - public String toString() { - return "CraftMonster"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMule.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMule.java index 97820a5da3..075bf368f7 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMule.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMule.java @@ -10,11 +10,6 @@ public class CraftMule extends CraftChestedHorse implements Mule { super(server, entity); } - @Override - public String toString() { - return "CraftMule"; - } - @Override public Variant getVariant() { return Variant.MULE; diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java index 1ac8b1a1b1..fb25c0f554 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java @@ -5,7 +5,6 @@ import com.google.common.collect.ImmutableList; import java.util.List; import net.minecraft.core.Holder; import net.minecraft.world.effect.MobEffect; -import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.item.component.SuspiciousStewEffects; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.potion.CraftPotionEffectType; @@ -15,10 +14,16 @@ import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; public class CraftMushroomCow extends CraftAbstractCow implements MushroomCow, io.papermc.paper.entity.PaperShearable { // Paper + public CraftMushroomCow(CraftServer server, net.minecraft.world.entity.animal.MushroomCow entity) { super(server, entity); } + @Override + public net.minecraft.world.entity.animal.MushroomCow getHandle() { + return (net.minecraft.world.entity.animal.MushroomCow) this.entity; + } + @Override public boolean hasEffectsForNextStew() { SuspiciousStewEffects stewEffects = this.getHandle().stewEffects; @@ -92,11 +97,6 @@ public class CraftMushroomCow extends CraftAbstractCow implements MushroomCow, i this.getHandle().stewEffects = null; } - @Override - public net.minecraft.world.entity.animal.MushroomCow getHandle() { - return (net.minecraft.world.entity.animal.MushroomCow) this.entity; - } - @Override public Variant getVariant() { return Variant.values()[this.getHandle().getVariant().ordinal()]; @@ -145,9 +145,4 @@ public class CraftMushroomCow extends CraftAbstractCow implements MushroomCow, i this.getHandle().stewEffects = new SuspiciousStewEffects(nmsPairs); } // Paper end - - @Override - public String toString() { - return "CraftMushroomCow"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftOcelot.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftOcelot.java index 2953a311ec..b4685c9773 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftOcelot.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftOcelot.java @@ -4,6 +4,7 @@ import org.bukkit.craftbukkit.CraftServer; import org.bukkit.entity.Ocelot; public class CraftOcelot extends CraftAnimals implements Ocelot { + public CraftOcelot(CraftServer server, net.minecraft.world.entity.animal.Ocelot ocelot) { super(server, ocelot); } @@ -32,9 +33,4 @@ public class CraftOcelot extends CraftAnimals implements Ocelot { public void setCatType(Type type) { throw new UnsupportedOperationException("Cats are now a different entity!"); } - - @Override - public String toString() { - return "CraftOcelot"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftOminousItemSpawner.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftOminousItemSpawner.java index ecdac2cf74..c8cc8a6956 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftOminousItemSpawner.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftOminousItemSpawner.java @@ -16,11 +16,6 @@ public class CraftOminousItemSpawner extends CraftEntity implements OminousItemS return (net.minecraft.world.entity.OminousItemSpawner) this.entity; } - @Override - public String toString() { - return "CraftOminousItemSpawner"; - } - @Override public ItemStack getItem() { return CraftItemStack.asBukkitCopy(this.getHandle().getItem()); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPainting.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPainting.java index bcac1359c6..614a173300 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPainting.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPainting.java @@ -14,6 +14,11 @@ public class CraftPainting extends CraftHanging implements Painting { super(server, entity); } + @Override + public net.minecraft.world.entity.decoration.Painting getHandle() { + return (net.minecraft.world.entity.decoration.Painting) this.entity; + } + @Override public Art getArt() { return CraftArt.minecraftHolderToBukkit(this.getHandle().getVariant()); @@ -49,14 +54,4 @@ public class CraftPainting extends CraftHanging implements Painting { return false; } - - @Override - public net.minecraft.world.entity.decoration.Painting getHandle() { - return (net.minecraft.world.entity.decoration.Painting) this.entity; - } - - @Override - public String toString() { - return "CraftPainting{art=" + this.getArt() + "}"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPanda.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPanda.java index 3e073a2681..df2877d055 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPanda.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPanda.java @@ -12,12 +12,7 @@ public class CraftPanda extends CraftAnimals implements Panda { @Override public net.minecraft.world.entity.animal.Panda getHandle() { - return (net.minecraft.world.entity.animal.Panda) super.getHandle(); - } - - @Override - public String toString() { - return "CraftPanda"; + return (net.minecraft.world.entity.animal.Panda) this.entity; } @Override diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftParrot.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftParrot.java index 0c6cd6bfec..60e1da70c6 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftParrot.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftParrot.java @@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity; import com.google.common.base.Preconditions; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.entity.Parrot; -import org.bukkit.entity.Parrot.Variant; public class CraftParrot extends CraftTameableAnimal implements Parrot { @@ -28,11 +27,6 @@ public class CraftParrot extends CraftTameableAnimal implements Parrot { this.getHandle().setVariant(net.minecraft.world.entity.animal.Parrot.Variant.byId(variant.ordinal())); } - @Override - public String toString() { - return "CraftParrot"; - } - @Override public boolean isDancing() { return this.getHandle().isPartyParrot(); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java index 37d15a0b12..ffeb5adc0c 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java @@ -15,7 +15,7 @@ public class CraftPhantom extends CraftFlying implements Phantom, CraftEnemy { @Override public net.minecraft.world.entity.monster.Phantom getHandle() { - return (net.minecraft.world.entity.monster.Phantom) super.getHandle(); + return (net.minecraft.world.entity.monster.Phantom) this.entity; } @Override @@ -28,11 +28,6 @@ public class CraftPhantom extends CraftFlying implements Phantom, CraftEnemy { this.getHandle().setPhantomSize(size); } - @Override - public String toString() { - return "CraftPhantom"; - } - @Override public UUID getSpawningEntity() { return this.getHandle().spawningEntity; diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPig.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPig.java index be50162e52..91f1e61e37 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPig.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPig.java @@ -9,10 +9,8 @@ import net.minecraft.world.entity.animal.PigVariant; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import org.bukkit.Material; -import org.bukkit.NamespacedKey; import org.bukkit.craftbukkit.CraftRegistry; import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.util.Handleable; import org.bukkit.entity.Pig; import org.jspecify.annotations.NullMarked; @@ -23,6 +21,11 @@ public class CraftPig extends CraftAnimals implements Pig { super(server, entity); } + @Override + public net.minecraft.world.entity.animal.Pig getHandle() { + return (net.minecraft.world.entity.animal.Pig) this.entity; + } + @Override public boolean hasSaddle() { return this.getHandle().isSaddled(); @@ -101,14 +104,4 @@ public class CraftPig extends CraftAnimals implements Pig { super(holder); } } - - @Override - public net.minecraft.world.entity.animal.Pig getHandle() { - return (net.minecraft.world.entity.animal.Pig) this.entity; - } - - @Override - public String toString() { - return "CraftPig"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPigZombie.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPigZombie.java index 49beb836d2..fa9d7a532e 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPigZombie.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPigZombie.java @@ -10,6 +10,11 @@ public class CraftPigZombie extends CraftZombie implements PigZombie { super(server, entity); } + @Override + public ZombifiedPiglin getHandle() { + return (ZombifiedPiglin) this.entity; + } + @Override public int getAnger() { return this.getHandle().getRemainingPersistentAngerTime(); @@ -30,16 +35,6 @@ public class CraftPigZombie extends CraftZombie implements PigZombie { return this.getAnger() > 0; } - @Override - public ZombifiedPiglin getHandle() { - return (ZombifiedPiglin) this.entity; - } - - @Override - public String toString() { - return "CraftPigZombie"; - } - @Override public boolean isConverting() { return false; diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java index e12ad80bc9..849873a9f5 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java @@ -18,6 +18,11 @@ public class CraftPiglin extends CraftPiglinAbstract implements Piglin, com.dest super(server, entity); } + @Override + public net.minecraft.world.entity.monster.piglin.Piglin getHandle() { + return (net.minecraft.world.entity.monster.piglin.Piglin) this.entity; + } + @Override public boolean isAbleToHunt() { return this.getHandle().cannotHunt; @@ -75,16 +80,6 @@ public class CraftPiglin extends CraftPiglinAbstract implements Piglin, com.dest return new CraftInventory(this.getHandle().inventory); } - @Override - public net.minecraft.world.entity.monster.piglin.Piglin getHandle() { - return (net.minecraft.world.entity.monster.piglin.Piglin) super.getHandle(); - } - - @Override - public String toString() { - return "CraftPiglin"; - } - @Override public void setChargingCrossbow(boolean chargingCrossbow) { this.getHandle().setChargingCrossbow(chargingCrossbow); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglinAbstract.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglinAbstract.java index e7957d6051..a30bbedafd 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglinAbstract.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglinAbstract.java @@ -11,6 +11,11 @@ public class CraftPiglinAbstract extends CraftMonster implements PiglinAbstract super(server, entity); } + @Override + public AbstractPiglin getHandle() { + return (AbstractPiglin) this.entity; + } + @Override public boolean isImmuneToZombification() { return this.getHandle().isImmuneToZombification(); @@ -94,9 +99,4 @@ public class CraftPiglinAbstract extends CraftMonster implements PiglinAbstract @Override public void setBreed(boolean b) { } - - @Override - public AbstractPiglin getHandle() { - return (AbstractPiglin) super.getHandle(); - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglinBrute.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglinBrute.java index be874dc973..2fa281466e 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglinBrute.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglinBrute.java @@ -11,11 +11,6 @@ public class CraftPiglinBrute extends CraftPiglinAbstract implements PiglinBrute @Override public net.minecraft.world.entity.monster.piglin.PiglinBrute getHandle() { - return (net.minecraft.world.entity.monster.piglin.PiglinBrute) super.getHandle(); - } - - @Override - public String toString() { - return "CraftPiglinBrute"; + return (net.minecraft.world.entity.monster.piglin.PiglinBrute) this.entity; } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPillager.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPillager.java index 2638c341bc..d927938df4 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPillager.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPillager.java @@ -13,12 +13,7 @@ public class CraftPillager extends CraftIllager implements Pillager, com.destroy @Override public net.minecraft.world.entity.monster.Pillager getHandle() { - return (net.minecraft.world.entity.monster.Pillager) super.getHandle(); - } - - @Override - public String toString() { - return "CraftPillager"; + return (net.minecraft.world.entity.monster.Pillager) this.entity; } @Override diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java index 0d319b7c39..c6ca86dbbb 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -43,6 +43,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Collectors; import javax.annotation.Nullable; +import net.md_5.bungee.api.chat.BaseComponent; import net.minecraft.advancements.AdvancementProgress; import net.minecraft.commands.Commands; import net.minecraft.core.BlockPos; @@ -203,10 +204,9 @@ import org.bukkit.potion.PotionEffectType; import org.bukkit.scoreboard.Scoreboard; import org.jetbrains.annotations.NotNull; -import net.md_5.bungee.api.chat.BaseComponent; // Spigot - @DelegateDeserialization(CraftOfflinePlayer.class) public class CraftPlayer extends CraftHumanEntity implements Player { + private long firstPlayed = 0; private long lastPlayed = 0; private boolean hasPlayedBefore = false; @@ -232,6 +232,27 @@ public class CraftPlayer extends CraftHumanEntity implements Player { this.firstPlayed = System.currentTimeMillis(); } + @Override + public ServerPlayer getHandle() { + return (ServerPlayer) this.entity; + } + + @Override + public boolean equals(Object obj) { + // Long-term, this should just use the super equals... for now, check the UUID + if (obj == this) return true; + if (!(obj instanceof OfflinePlayer other)) return false; + return this.getUniqueId().equals(other.getUniqueId()); + } + + @Override + public int hashCode() { + if (this.hash == 0 || this.hash == 485) { + this.hash = 97 * 5 + this.getUniqueId().hashCode(); + } + return this.hash; + } + public GameProfile getProfile() { return this.getHandle().getGameProfile(); } @@ -662,14 +683,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player { this.getHandle().connection.send(packet); } - @Override - public boolean equals(Object obj) { - // Long-term, this should just use the super equals... for now, check the UUID - if (obj == this) return true; - if (!(obj instanceof OfflinePlayer other)) return false; - return this.getUniqueId().equals(other.getUniqueId()); - } - @Override public void kickPlayer(String message) { org.spigotmc.AsyncCatcher.catchOp("player kick"); // Spigot @@ -2306,28 +2319,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return this; } - @Override - public ServerPlayer getHandle() { - return (ServerPlayer) this.entity; - } - - public void setHandle(final ServerPlayer entity) { - super.setHandle(entity); - } - - @Override - public String toString() { - return "CraftPlayer{" + "name=" + this.getName() + '}'; - } - - @Override - public int hashCode() { - if (this.hash == 0 || this.hash == 485) { - this.hash = 97 * 5 + this.getUniqueId().hashCode(); - } - return this.hash; - } - @Override public long getFirstPlayed() { return this.firstPlayed; diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPolarBear.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPolarBear.java index 3d1d5d4eaa..1e3b8eb597 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPolarBear.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPolarBear.java @@ -8,16 +8,12 @@ public class CraftPolarBear extends CraftAnimals implements PolarBear { public CraftPolarBear(CraftServer server, net.minecraft.world.entity.animal.PolarBear entity) { super(server, entity); } + @Override public net.minecraft.world.entity.animal.PolarBear getHandle() { return (net.minecraft.world.entity.animal.PolarBear) this.entity; } - @Override - public String toString() { - return "CraftPolarBear"; - } - @Override public boolean isStanding() { return this.getHandle().isStanding(); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftProjectile.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftProjectile.java index a636182e27..94ae0f2077 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftProjectile.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftProjectile.java @@ -4,6 +4,7 @@ import org.bukkit.craftbukkit.CraftServer; import org.bukkit.entity.Projectile; public abstract class CraftProjectile extends AbstractProjectile implements Projectile { + public CraftProjectile(CraftServer server, net.minecraft.world.entity.projectile.Projectile entity) { super(server, entity); } @@ -12,9 +13,4 @@ public abstract class CraftProjectile extends AbstractProjectile implements Proj public net.minecraft.world.entity.projectile.Projectile getHandle() { return (net.minecraft.world.entity.projectile.Projectile) this.entity; } - - @Override - public String toString() { - return "CraftProjectile"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPufferFish.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPufferFish.java index 35a8219734..e63c3bdd1b 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPufferFish.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPufferFish.java @@ -12,7 +12,7 @@ public class CraftPufferFish extends CraftFish implements PufferFish { @Override public Pufferfish getHandle() { - return (Pufferfish) super.getHandle(); + return (Pufferfish) this.entity; } @Override @@ -24,9 +24,4 @@ public class CraftPufferFish extends CraftFish implements PufferFish { public void setPuffState(int state) { this.getHandle().setPuffState(state); } - - @Override - public String toString() { - return "CraftPufferFish"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftRabbit.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftRabbit.java index afa581272b..994eb2d881 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftRabbit.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftRabbit.java @@ -14,11 +14,6 @@ public class CraftRabbit extends CraftAnimals implements Rabbit { return (net.minecraft.world.entity.animal.Rabbit) this.entity; } - @Override - public String toString() { - return "CraftRabbit{RabbitType=" + this.getRabbitType() + "}"; - } - @Override public Type getRabbitType() { return Type.values()[this.getHandle().getVariant().ordinal()]; diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftRaider.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftRaider.java index 1988ba305a..42d89992c8 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftRaider.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftRaider.java @@ -18,12 +18,7 @@ public abstract class CraftRaider extends CraftMonster implements Raider { @Override public net.minecraft.world.entity.raid.Raider getHandle() { - return (net.minecraft.world.entity.raid.Raider) super.getHandle(); - } - - @Override - public String toString() { - return "CraftRaider"; + return (net.minecraft.world.entity.raid.Raider) this.entity; } @Override diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftRavager.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftRavager.java index 42d9c9449f..ec2b5fbeca 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftRavager.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftRavager.java @@ -11,12 +11,7 @@ public class CraftRavager extends CraftRaider implements Ravager { @Override public net.minecraft.world.entity.monster.Ravager getHandle() { - return (net.minecraft.world.entity.monster.Ravager) super.getHandle(); - } - - @Override - public String toString() { - return "CraftRavager"; + return (net.minecraft.world.entity.monster.Ravager) this.entity; } @Override diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSalmon.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSalmon.java index cb044eae9f..8b2c8924f6 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSalmon.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSalmon.java @@ -12,12 +12,7 @@ public class CraftSalmon extends io.papermc.paper.entity.PaperSchoolableFish imp @Override public net.minecraft.world.entity.animal.Salmon getHandle() { - return (net.minecraft.world.entity.animal.Salmon) super.getHandle(); - } - - @Override - public String toString() { - return "CraftSalmon"; + return (net.minecraft.world.entity.animal.Salmon) this.entity; } @Override diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java index 50757c1f44..95c1535a1c 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java @@ -5,10 +5,16 @@ import org.bukkit.craftbukkit.CraftServer; import org.bukkit.entity.Sheep; public class CraftSheep extends CraftAnimals implements Sheep, io.papermc.paper.entity.PaperShearable { // Paper + public CraftSheep(CraftServer server, net.minecraft.world.entity.animal.sheep.Sheep entity) { super(server, entity); } + @Override + public net.minecraft.world.entity.animal.sheep.Sheep getHandle() { + return (net.minecraft.world.entity.animal.sheep.Sheep) this.entity; + } + @Override public DyeColor getColor() { return DyeColor.getByWoolData((byte) this.getHandle().getColor().getId()); @@ -28,14 +34,4 @@ public class CraftSheep extends CraftAnimals implements Sheep, io.papermc.paper. public void setSheared(boolean flag) { this.getHandle().setSheared(flag); } - - @Override - public net.minecraft.world.entity.animal.sheep.Sheep getHandle() { - return (net.minecraft.world.entity.animal.sheep.Sheep) this.entity; - } - - @Override - public String toString() { - return "CraftSheep"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftShulker.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftShulker.java index 05ec06b716..c23b88cada 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftShulker.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftShulker.java @@ -13,11 +13,6 @@ public class CraftShulker extends CraftGolem implements Shulker, CraftEnemy { super(server, entity); } - @Override - public String toString() { - return "CraftShulker"; - } - @Override public net.minecraft.world.entity.monster.Shulker getHandle() { return (net.minecraft.world.entity.monster.Shulker) this.entity; diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftShulkerBullet.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftShulkerBullet.java index 52d0dbf178..9a1a581e52 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftShulkerBullet.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftShulkerBullet.java @@ -10,6 +10,11 @@ public class CraftShulkerBullet extends AbstractProjectile implements ShulkerBul super(server, entity); } + @Override + public net.minecraft.world.entity.projectile.ShulkerBullet getHandle() { + return (net.minecraft.world.entity.projectile.ShulkerBullet) this.entity; + } + @Override public org.bukkit.entity.Entity getTarget() { return this.getHandle().getTarget() != null ? this.getHandle().getTarget().getBukkitEntity() : null; @@ -59,14 +64,4 @@ public class CraftShulkerBullet extends AbstractProjectile implements ShulkerBul public void setFlightSteps(int steps) { this.getHandle().flightSteps = steps; } - - @Override - public String toString() { - return "CraftShulkerBullet"; - } - - @Override - public net.minecraft.world.entity.projectile.ShulkerBullet getHandle() { - return (net.minecraft.world.entity.projectile.ShulkerBullet) this.entity; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSilverfish.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSilverfish.java index 7c75d78e5e..d5acee3d7b 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSilverfish.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSilverfish.java @@ -4,6 +4,7 @@ import org.bukkit.craftbukkit.CraftServer; import org.bukkit.entity.Silverfish; public class CraftSilverfish extends CraftMonster implements Silverfish { + public CraftSilverfish(CraftServer server, net.minecraft.world.entity.monster.Silverfish entity) { super(server, entity); } @@ -12,9 +13,4 @@ public class CraftSilverfish extends CraftMonster implements Silverfish { public net.minecraft.world.entity.monster.Silverfish getHandle() { return (net.minecraft.world.entity.monster.Silverfish) this.entity; } - - @Override - public String toString() { - return "CraftSilverfish"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSizedFireball.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSizedFireball.java index de3327812c..579ec54530 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSizedFireball.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSizedFireball.java @@ -13,6 +13,11 @@ public class CraftSizedFireball extends CraftFireball implements SizedFireball { super(server, entity); } + @Override + public Fireball getHandle() { + return (Fireball) this.entity; + } + @Override public ItemStack getDisplayItem() { if (this.getHandle().getItem().isEmpty()) { @@ -26,9 +31,4 @@ public class CraftSizedFireball extends CraftFireball implements SizedFireball { public void setDisplayItem(ItemStack item) { this.getHandle().setItem(CraftItemStack.asNMSCopy(item)); } - - @Override - public Fireball getHandle() { - return (Fireball) this.entity; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java index 8669297723..af73ee0ce8 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java @@ -10,6 +10,11 @@ public class CraftSkeleton extends CraftAbstractSkeleton implements Skeleton { super(server, entity); } + @Override + public net.minecraft.world.entity.monster.Skeleton getHandle() { + return (net.minecraft.world.entity.monster.Skeleton) this.entity; + } + @Override public boolean isConverting() { return this.getHandle().isFreezeConverting(); @@ -31,16 +36,6 @@ public class CraftSkeleton extends CraftAbstractSkeleton implements Skeleton { } } - @Override - public net.minecraft.world.entity.monster.Skeleton getHandle() { - return (net.minecraft.world.entity.monster.Skeleton) this.entity; - } - - @Override - public String toString() { - return "CraftSkeleton"; - } - @Override public SkeletonType getSkeletonType() { return SkeletonType.NORMAL; diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java index 248e4febbe..f40729e9cf 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java @@ -11,8 +11,8 @@ public class CraftSkeletonHorse extends CraftAbstractHorse implements SkeletonHo } @Override - public String toString() { - return "CraftSkeletonHorse"; + public net.minecraft.world.entity.animal.horse.SkeletonHorse getHandle() { + return (net.minecraft.world.entity.animal.horse.SkeletonHorse) this.entity; } @Override @@ -20,11 +20,6 @@ public class CraftSkeletonHorse extends CraftAbstractHorse implements SkeletonHo return Variant.SKELETON_HORSE; } - @Override - public net.minecraft.world.entity.animal.horse.SkeletonHorse getHandle() { - return (net.minecraft.world.entity.animal.horse.SkeletonHorse) this.entity; - } - @Override public boolean isTrapped() { return this.getHandle().isTrap(); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java index dde173d35f..214e636701 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java @@ -9,6 +9,11 @@ public class CraftSlime extends CraftMob implements Slime, CraftEnemy { super(server, entity); } + @Override + public net.minecraft.world.entity.monster.Slime getHandle() { + return (net.minecraft.world.entity.monster.Slime) this.entity; + } + @Override public int getSize() { return this.getHandle().getSize(); @@ -19,16 +24,6 @@ public class CraftSlime extends CraftMob implements Slime, CraftEnemy { this.getHandle().setSize(size, /* true */ getHandle().isAlive()); // Paper - fix dead slime setSize invincibility } - @Override - public net.minecraft.world.entity.monster.Slime getHandle() { - return (net.minecraft.world.entity.monster.Slime) this.entity; - } - - @Override - public String toString() { - return "CraftSlime"; - } - @Override public boolean canWander() { return this.getHandle().canWander(); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSmallFireball.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSmallFireball.java index 072df20685..fbd3f86bfd 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSmallFireball.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSmallFireball.java @@ -4,6 +4,7 @@ import org.bukkit.craftbukkit.CraftServer; import org.bukkit.entity.SmallFireball; public class CraftSmallFireball extends CraftSizedFireball implements SmallFireball { + public CraftSmallFireball(CraftServer server, net.minecraft.world.entity.projectile.SmallFireball entity) { super(server, entity); } @@ -12,9 +13,4 @@ public class CraftSmallFireball extends CraftSizedFireball implements SmallFireb public net.minecraft.world.entity.projectile.SmallFireball getHandle() { return (net.minecraft.world.entity.projectile.SmallFireball) this.entity; } - - @Override - public String toString() { - return "CraftSmallFireball"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSniffer.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSniffer.java index 7a9abd3af4..808b037b66 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSniffer.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSniffer.java @@ -18,12 +18,7 @@ public class CraftSniffer extends CraftAnimals implements Sniffer { @Override public net.minecraft.world.entity.animal.sniffer.Sniffer getHandle() { - return (net.minecraft.world.entity.animal.sniffer.Sniffer) super.getHandle(); - } - - @Override - public String toString() { - return "CraftSniffer"; + return (net.minecraft.world.entity.animal.sniffer.Sniffer) this.entity; } @Override diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowball.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowball.java index d959825fd1..b31f2a939e 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowball.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowball.java @@ -4,6 +4,7 @@ import org.bukkit.craftbukkit.CraftServer; import org.bukkit.entity.Snowball; public class CraftSnowball extends CraftThrowableProjectile implements Snowball { + public CraftSnowball(CraftServer server, net.minecraft.world.entity.projectile.Snowball entity) { super(server, entity); } @@ -12,9 +13,4 @@ public class CraftSnowball extends CraftThrowableProjectile implements Snowball public net.minecraft.world.entity.projectile.Snowball getHandle() { return (net.minecraft.world.entity.projectile.Snowball) this.entity; } - - @Override - public String toString() { - return "CraftSnowball"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java index 4ce2373ff7..f03f9f94c5 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java @@ -5,10 +5,16 @@ import org.bukkit.craftbukkit.CraftServer; import org.bukkit.entity.Snowman; public class CraftSnowman extends CraftGolem implements Snowman, com.destroystokyo.paper.entity.CraftRangedEntity, io.papermc.paper.entity.PaperShearable { // Paper + public CraftSnowman(CraftServer server, SnowGolem entity) { super(server, entity); } + @Override + public SnowGolem getHandle() { + return (SnowGolem) this.entity; + } + @Override public boolean isDerp() { return !this.getHandle().hasPumpkin(); @@ -18,14 +24,4 @@ public class CraftSnowman extends CraftGolem implements Snowman, com.destroystok public void setDerp(boolean derpMode) { this.getHandle().setPumpkin(!derpMode); } - - @Override - public SnowGolem getHandle() { - return (SnowGolem) this.entity; - } - - @Override - public String toString() { - return "CraftSnowman"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSpectralArrow.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSpectralArrow.java index 70f1f87400..4afd6e013a 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSpectralArrow.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSpectralArrow.java @@ -14,11 +14,6 @@ public class CraftSpectralArrow extends CraftAbstractArrow implements SpectralAr return (net.minecraft.world.entity.projectile.SpectralArrow) this.entity; } - @Override - public String toString() { - return "CraftSpectralArrow"; - } - @Override public int getGlowingTicks() { return this.getHandle().duration; diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSpellcaster.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSpellcaster.java index 525827f174..b28ef9d000 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSpellcaster.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSpellcaster.java @@ -4,7 +4,6 @@ import com.google.common.base.Preconditions; import net.minecraft.world.entity.monster.SpellcasterIllager; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.entity.Spellcaster; -import org.bukkit.entity.Spellcaster.Spell; public class CraftSpellcaster extends CraftIllager implements Spellcaster { @@ -14,12 +13,7 @@ public class CraftSpellcaster extends CraftIllager implements Spellcaster { @Override public SpellcasterIllager getHandle() { - return (SpellcasterIllager) super.getHandle(); - } - - @Override - public String toString() { - return "CraftSpellcaster"; + return (SpellcasterIllager) this.entity; } @Override diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSpider.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSpider.java index b4afc37c21..90be754d6a 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSpider.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSpider.java @@ -13,9 +13,4 @@ public class CraftSpider extends CraftMonster implements Spider { public net.minecraft.world.entity.monster.Spider getHandle() { return (net.minecraft.world.entity.monster.Spider) this.entity; } - - @Override - public String toString() { - return "CraftSpider"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSquid.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSquid.java index 067a95ea50..d1a49aaa25 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSquid.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSquid.java @@ -13,9 +13,4 @@ public class CraftSquid extends CraftAgeable implements Squid { public net.minecraft.world.entity.animal.Squid getHandle() { return (net.minecraft.world.entity.animal.Squid) this.entity; } - - @Override - public String toString() { - return "CraftSquid"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftStray.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftStray.java index 833290525b..397ca2e097 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftStray.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftStray.java @@ -10,11 +10,6 @@ public class CraftStray extends CraftAbstractSkeleton implements Stray { super(server, entity); } - @Override - public String toString() { - return "CraftStray"; - } - @Override public SkeletonType getSkeletonType() { return SkeletonType.STRAY; diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftStrider.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftStrider.java index 53f067346e..6c03adc7b0 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftStrider.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftStrider.java @@ -14,6 +14,11 @@ public class CraftStrider extends CraftAnimals implements Strider { super(server, entity); } + @Override + public net.minecraft.world.entity.monster.Strider getHandle() { + return (net.minecraft.world.entity.monster.Strider) this.entity; + } + @Override public boolean isShivering() { return this.getHandle().isSuffocating(); @@ -67,14 +72,4 @@ public class CraftStrider extends CraftAnimals implements Strider { public Material getSteerMaterial() { return Material.WARPED_FUNGUS_ON_A_STICK; } - - @Override - public net.minecraft.world.entity.monster.Strider getHandle() { - return (net.minecraft.world.entity.monster.Strider) this.entity; - } - - @Override - public String toString() { - return "CraftStrider"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java index 465edd85d9..eea78db7f1 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java @@ -12,6 +12,11 @@ public class CraftTNTPrimed extends CraftEntity implements TNTPrimed { super(server, entity); } + @Override + public PrimedTnt getHandle() { + return (PrimedTnt) this.entity; + } + @Override public float getYield() { return this.getHandle().explosionPower; @@ -42,16 +47,6 @@ public class CraftTNTPrimed extends CraftEntity implements TNTPrimed { this.getHandle().setFuse(fuseTicks); } - @Override - public PrimedTnt getHandle() { - return (PrimedTnt) this.entity; - } - - @Override - public String toString() { - return "CraftTNTPrimed"; - } - @Override public Entity getSource() { net.minecraft.world.entity.LivingEntity source = this.getHandle().getOwner(); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTadpole.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTadpole.java index 18001eae96..1efb6f720f 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTadpole.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTadpole.java @@ -14,11 +14,6 @@ public class CraftTadpole extends CraftFish implements org.bukkit.entity.Tadpole return (Tadpole) this.entity; } - @Override - public String toString() { - return "CraftTadpole"; - } - @Override public int getAge() { return this.getHandle().age; diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java index d2555af89f..d41b159e33 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java @@ -10,13 +10,14 @@ import org.bukkit.entity.Creature; import org.bukkit.entity.Tameable; public class CraftTameableAnimal extends CraftAnimals implements Tameable, Creature { + public CraftTameableAnimal(CraftServer server, TamableAnimal entity) { super(server, entity); } @Override public TamableAnimal getHandle() { - return (TamableAnimal) super.getHandle(); + return (TamableAnimal) this.entity; } @Override @@ -79,9 +80,4 @@ public class CraftTameableAnimal extends CraftAnimals implements Tameable, Creat this.getHandle().setInSittingPose(sitting); this.getHandle().setOrderedToSit(sitting); } - - @Override - public String toString() { - return this.getClass().getSimpleName() + "{owner=" + this.getOwner() + ",tamed=" + this.isTamed() + "}"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTextDisplay.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTextDisplay.java index 580e4f77d1..36b40c8478 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTextDisplay.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTextDisplay.java @@ -15,12 +15,7 @@ public class CraftTextDisplay extends CraftDisplay implements TextDisplay { @Override public net.minecraft.world.entity.Display.TextDisplay getHandle() { - return (net.minecraft.world.entity.Display.TextDisplay) super.getHandle(); - } - - @Override - public String toString() { - return "CraftTextDisplay"; + return (net.minecraft.world.entity.Display.TextDisplay) this.entity; } @Override diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftThrowableProjectile.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftThrowableProjectile.java index 5c660de48b..f34b81ac5a 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftThrowableProjectile.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftThrowableProjectile.java @@ -12,6 +12,11 @@ public abstract class CraftThrowableProjectile extends CraftProjectile implement super(server, entity); } + @Override + public ThrowableItemProjectile getHandle() { + return (ThrowableItemProjectile) this.entity; + } + @Override public ItemStack getItem() { if (this.getHandle().getItem().isEmpty()) { @@ -25,9 +30,4 @@ public abstract class CraftThrowableProjectile extends CraftProjectile implement public void setItem(ItemStack item) { this.getHandle().setItem(CraftItemStack.asNMSCopy(item)); } - - @Override - public ThrowableItemProjectile getHandle() { - return (ThrowableItemProjectile) this.entity; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownExpBottle.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownExpBottle.java index 5e7fef664c..9e4b555450 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownExpBottle.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownExpBottle.java @@ -5,6 +5,7 @@ import org.bukkit.craftbukkit.CraftServer; import org.bukkit.entity.ThrownExpBottle; public class CraftThrownExpBottle extends CraftThrowableProjectile implements ThrownExpBottle { + public CraftThrownExpBottle(CraftServer server, ThrownExperienceBottle entity) { super(server, entity); } @@ -13,9 +14,4 @@ public class CraftThrownExpBottle extends CraftThrowableProjectile implements Th public ThrownExperienceBottle getHandle() { return (ThrownExperienceBottle) this.entity; } - - @Override - public String toString() { - return "EntityThrownExpBottle"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownLingeringPotion.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownLingeringPotion.java index 67db3c421f..8be9f69889 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownLingeringPotion.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownLingeringPotion.java @@ -16,6 +16,11 @@ public class CraftThrownLingeringPotion extends CraftThrownPotion implements Lin super(server, entity); } + @Override + public ThrownLingeringPotion getHandle() { + return (ThrownLingeringPotion) this.entity; + } + @Override public void setItem(final ItemStack item) { Preconditions.checkArgument(item != null, "ItemStack cannot be null"); @@ -30,9 +35,4 @@ public class CraftThrownLingeringPotion extends CraftThrownPotion implements Lin public PotionMeta getPotionMeta() { return (PotionMeta) CraftItemStack.getItemMeta(this.getHandle().getItem(), ItemType.LINGERING_POTION); } - - @Override - public ThrownLingeringPotion getHandle() { - return (ThrownLingeringPotion) this.entity; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java index 7927b8c043..61becdf5c4 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java @@ -19,6 +19,11 @@ public abstract class CraftThrownPotion extends CraftThrowableProjectile impleme super(server, entity); } + @Override + public AbstractThrownPotion getHandle() { + return (AbstractThrownPotion) this.entity; + } + @Override public Collection getEffects() { ImmutableList.Builder builder = ImmutableList.builder(); @@ -44,9 +49,4 @@ public abstract class CraftThrownPotion extends CraftThrowableProjectile impleme public void splash() { this.getHandle().splash(null); } - - @Override - public AbstractThrownPotion getHandle() { - return (AbstractThrownPotion) this.entity; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownSplashPotion.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownSplashPotion.java index 42c7f16ef1..8e7078878b 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownSplashPotion.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownSplashPotion.java @@ -16,6 +16,11 @@ public class CraftThrownSplashPotion extends CraftThrownPotion implements Splash super(server, entity); } + @Override + public ThrownSplashPotion getHandle() { + return (ThrownSplashPotion) this.entity; + } + @Override public void setItem(final ItemStack item) { Preconditions.checkArgument(item != null, "ItemStack cannot be null"); @@ -30,9 +35,4 @@ public class CraftThrownSplashPotion extends CraftThrownPotion implements Splash public PotionMeta getPotionMeta() { return (PotionMeta) CraftItemStack.getItemMeta(this.getHandle().getItem(), ItemType.SPLASH_POTION); } - - @Override - public ThrownSplashPotion getHandle() { - return (ThrownSplashPotion) this.entity; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTraderLlama.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTraderLlama.java index 4b3a764114..174332208a 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTraderLlama.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTraderLlama.java @@ -11,11 +11,6 @@ public class CraftTraderLlama extends CraftLlama implements TraderLlama { @Override public net.minecraft.world.entity.animal.horse.TraderLlama getHandle() { - return (net.minecraft.world.entity.animal.horse.TraderLlama) super.getHandle(); - } - - @Override - public String toString() { - return "CraftTraderLlama"; + return (net.minecraft.world.entity.animal.horse.TraderLlama) this.entity; } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java index 3e34efebc6..6d4f7d5164 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java @@ -14,7 +14,7 @@ public class CraftTrident extends CraftAbstractArrow implements Trident { @Override public ThrownTrident getHandle() { - return (ThrownTrident) super.getHandle(); + return (ThrownTrident) this.entity; } @Override @@ -27,11 +27,6 @@ public class CraftTrident extends CraftAbstractArrow implements Trident { this.getHandle().pickupItemStack = CraftItemStack.asNMSCopy(itemStack); } - @Override - public String toString() { - return "CraftTrident"; - } - @Override public boolean hasGlint() { return this.getHandle().isFoil(); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTropicalFish.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTropicalFish.java index 238ab5c01a..6ec2e173c5 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTropicalFish.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTropicalFish.java @@ -15,11 +15,6 @@ public class CraftTropicalFish extends io.papermc.paper.entity.PaperSchoolableFi return (net.minecraft.world.entity.animal.TropicalFish) this.entity; } - @Override - public String toString() { - return "CraftTropicalFish"; - } - @Override public DyeColor getPatternColor() { return CraftTropicalFish.getPatternColor(this.getHandle().getPackedVariant()); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java index f8335d9ed1..3aae36e3bd 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java @@ -12,12 +12,7 @@ public class CraftTurtle extends CraftAnimals implements Turtle { @Override public net.minecraft.world.entity.animal.Turtle getHandle() { - return (net.minecraft.world.entity.animal.Turtle) super.getHandle(); - } - - @Override - public String toString() { - return "CraftTurtle"; + return (net.minecraft.world.entity.animal.Turtle) this.entity; } @Override diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftVehicle.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftVehicle.java index 59e5b417e8..d58b163bfd 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftVehicle.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftVehicle.java @@ -4,12 +4,8 @@ import org.bukkit.craftbukkit.CraftServer; import org.bukkit.entity.Vehicle; public abstract class CraftVehicle extends CraftEntity implements Vehicle { + public CraftVehicle(CraftServer server, net.minecraft.world.entity.Entity entity) { super(server, entity); } - - @Override - public String toString() { - return "CraftVehicle{passenger=" + this.getPassenger() + '}'; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java index 23a469ba8f..227640d34d 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java @@ -15,7 +15,7 @@ public class CraftVex extends CraftMonster implements Vex { @Override public net.minecraft.world.entity.monster.Vex getHandle() { - return (net.minecraft.world.entity.monster.Vex) super.getHandle(); + return (net.minecraft.world.entity.monster.Vex) this.entity; } @Override @@ -49,11 +49,6 @@ public class CraftVex extends CraftMonster implements Vex { this.getHandle().limitedLifeTicks = ticks; } - @Override - public String toString() { - return "CraftVex"; - } - @Override public boolean isCharging() { return this.getHandle().isCharging(); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java index 196e64467d..258e149a4c 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java @@ -35,11 +35,6 @@ public class CraftVillager extends CraftAbstractVillager implements Villager { return (net.minecraft.world.entity.npc.Villager) this.entity; } - @Override - public String toString() { - return "CraftVillager"; - } - @Override public void remove() { this.getHandle().releaseAllPois(); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftVillagerZombie.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftVillagerZombie.java index 8359329936..c09a3e065b 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftVillagerZombie.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftVillagerZombie.java @@ -16,12 +16,7 @@ public class CraftVillagerZombie extends CraftZombie implements ZombieVillager { @Override public net.minecraft.world.entity.monster.ZombieVillager getHandle() { - return (net.minecraft.world.entity.monster.ZombieVillager) super.getHandle(); - } - - @Override - public String toString() { - return "CraftVillagerZombie"; + return (net.minecraft.world.entity.monster.ZombieVillager) this.entity; } @Override diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java index bcd3370bc4..4207a1cd75 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java @@ -11,12 +11,7 @@ public class CraftVindicator extends CraftIllager implements Vindicator { @Override public net.minecraft.world.entity.monster.Vindicator getHandle() { - return (net.minecraft.world.entity.monster.Vindicator) super.getHandle(); - } - - @Override - public String toString() { - return "CraftVindicator"; + return (net.minecraft.world.entity.monster.Vindicator) this.entity; } @Override diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java index 657b450178..e698cbf4f1 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java @@ -15,11 +15,6 @@ public class CraftWanderingTrader extends CraftAbstractVillager implements Wande return (net.minecraft.world.entity.npc.WanderingTrader) this.entity; } - @Override - public String toString() { - return "CraftWanderingTrader"; - } - @Override public int getDespawnDelay() { return this.getHandle().getDespawnDelay(); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWarden.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWarden.java index f27f2812f7..7a8f524e0c 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWarden.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWarden.java @@ -20,11 +20,6 @@ public class CraftWarden extends CraftMonster implements org.bukkit.entity.Warde return (Warden) this.entity; } - @Override - public String toString() { - return "CraftWarden"; - } - @Override public int getAnger() { return this.getHandle().getAngerManagement().getActiveAnger(this.getHandle().getTarget()); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWaterMob.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWaterMob.java index 1b347deb6e..be249743cb 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWaterMob.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWaterMob.java @@ -14,9 +14,4 @@ public class CraftWaterMob extends CraftCreature implements WaterMob { public WaterAnimal getHandle() { return (WaterAnimal) this.entity; } - - @Override - public String toString() { - return "CraftWaterMob"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWindCharge.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWindCharge.java index 46447b9651..bb3301ff6a 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWindCharge.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWindCharge.java @@ -4,6 +4,7 @@ import org.bukkit.craftbukkit.CraftServer; import org.bukkit.entity.WindCharge; public class CraftWindCharge extends CraftAbstractWindCharge implements WindCharge { + public CraftWindCharge(CraftServer server, net.minecraft.world.entity.projectile.windcharge.WindCharge entity) { super(server, entity); } @@ -12,9 +13,4 @@ public class CraftWindCharge extends CraftAbstractWindCharge implements WindChar public net.minecraft.world.entity.projectile.windcharge.WindCharge getHandle() { return (net.minecraft.world.entity.projectile.windcharge.WindCharge) this.entity; } - - @Override - public String toString() { - return "CraftWindCharge"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java index ab86a8c850..007a11e4d6 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java @@ -1,13 +1,14 @@ package org.bukkit.craftbukkit.entity; import com.google.common.base.Preconditions; +import org.bukkit.Material; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.entity.Witch; -import org.bukkit.Material; import org.bukkit.inventory.ItemStack; public class CraftWitch extends CraftRaider implements Witch, com.destroystokyo.paper.entity.CraftRangedEntity { // Paper + public CraftWitch(CraftServer server, net.minecraft.world.entity.monster.Witch entity) { super(server, entity); } @@ -17,11 +18,6 @@ public class CraftWitch extends CraftRaider implements Witch, com.destroystokyo. return (net.minecraft.world.entity.monster.Witch) this.entity; } - @Override - public String toString() { - return "CraftWitch"; - } - @Override public boolean isDrinkingPotion() { return this.getHandle().isDrinkingPotion(); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java index 51383cd065..2e11df97e5 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java @@ -26,11 +26,6 @@ public class CraftWither extends CraftMonster implements Wither, com.destroystok return (WitherBoss) this.entity; } - @Override - public String toString() { - return "CraftWither"; - } - @Override public BossBar getBossBar() { return this.bossBar; diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWitherSkeleton.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWitherSkeleton.java index ffee517b2d..79eee42227 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWitherSkeleton.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWitherSkeleton.java @@ -10,11 +10,6 @@ public class CraftWitherSkeleton extends CraftAbstractSkeleton implements Wither super(server, entity); } - @Override - public String toString() { - return "CraftWitherSkeleton"; - } - @Override public SkeletonType getSkeletonType() { return SkeletonType.WITHER; diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWitherSkull.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWitherSkull.java index bc97839125..0278493681 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWitherSkull.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWitherSkull.java @@ -4,10 +4,16 @@ import org.bukkit.craftbukkit.CraftServer; import org.bukkit.entity.WitherSkull; public class CraftWitherSkull extends CraftFireball implements WitherSkull { + public CraftWitherSkull(CraftServer server, net.minecraft.world.entity.projectile.WitherSkull entity) { super(server, entity); } + @Override + public net.minecraft.world.entity.projectile.WitherSkull getHandle() { + return (net.minecraft.world.entity.projectile.WitherSkull) this.entity; + } + @Override public void setCharged(boolean charged) { this.getHandle().setDangerous(charged); @@ -17,14 +23,4 @@ public class CraftWitherSkull extends CraftFireball implements WitherSkull { public boolean isCharged() { return this.getHandle().isDangerous(); } - - @Override - public net.minecraft.world.entity.projectile.WitherSkull getHandle() { - return (net.minecraft.world.entity.projectile.WitherSkull) this.entity; - } - - @Override - public String toString() { - return "CraftWitherSkull"; - } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java index b9cd648b29..c3bd4cc145 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java @@ -13,10 +13,16 @@ import org.bukkit.craftbukkit.util.Handleable; import org.bukkit.entity.Wolf; public class CraftWolf extends CraftTameableAnimal implements Wolf { + public CraftWolf(CraftServer server, net.minecraft.world.entity.animal.wolf.Wolf wolf) { super(server, wolf); } + @Override + public net.minecraft.world.entity.animal.wolf.Wolf getHandle() { + return (net.minecraft.world.entity.animal.wolf.Wolf) this.entity; + } + @Override public boolean isAngry() { return this.getHandle().isAngry(); @@ -31,11 +37,6 @@ public class CraftWolf extends CraftTameableAnimal implements Wolf { } } - @Override - public net.minecraft.world.entity.animal.wolf.Wolf getHandle() { - return (net.minecraft.world.entity.animal.wolf.Wolf) this.entity; - } - @Override public DyeColor getCollarColor() { return DyeColor.getByWoolData((byte) this.getHandle().getCollarColor().getId()); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftZoglin.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftZoglin.java index c134c4bb8c..583af95616 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftZoglin.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftZoglin.java @@ -9,6 +9,11 @@ public class CraftZoglin extends CraftMonster implements Zoglin { super(server, entity); } + @Override + public net.minecraft.world.entity.monster.Zoglin getHandle() { + return (net.minecraft.world.entity.monster.Zoglin) this.entity; + } + @Override public boolean isBaby() { return this.getHandle().isBaby(); @@ -19,16 +24,6 @@ public class CraftZoglin extends CraftMonster implements Zoglin { this.getHandle().setBaby(flag); } - @Override - public net.minecraft.world.entity.monster.Zoglin getHandle() { - return (net.minecraft.world.entity.monster.Zoglin) this.entity; - } - - @Override - public String toString() { - return "CraftZoglin"; - } - @Override public int getAge() { return this.getHandle().isBaby() ? -1 : 0; diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java index ec0869363d..9851c3890c 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java @@ -17,11 +17,6 @@ public class CraftZombie extends CraftMonster implements Zombie { return (net.minecraft.world.entity.monster.Zombie) this.entity; } - @Override - public String toString() { - return "CraftZombie"; - } - @Override public boolean isBaby() { return this.getHandle().isBaby(); diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftZombieHorse.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftZombieHorse.java index 2c47ea42df..1b3b52a543 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftZombieHorse.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftZombieHorse.java @@ -10,11 +10,6 @@ public class CraftZombieHorse extends CraftAbstractHorse implements ZombieHorse super(server, entity); } - @Override - public String toString() { - return "CraftZombieHorse"; - } - @Override public Variant getVariant() { return Variant.UNDEAD_HORSE; diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.java b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.java index ea7335e32d..75fa6f99c9 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.java @@ -33,11 +33,6 @@ public class CraftMerchantCustom implements CraftMerchant { } // Paper end - @Override - public String toString() { - return "CraftMerchantCustom"; - } - @Override public MinecraftMerchant getMerchant() { return this.merchant;