From 5d0b3018de89da69ee3ada71f82f0f0f4ab9ca9c Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Sun, 13 Aug 2023 07:52:40 +1000
Subject: [PATCH] #1235: Move EntityType return to base Entity class
By: DerFrZocker <derrieple@gmail.com>
---
.../org/bukkit/craftbukkit/entity/CraftAllay.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftAmbient.java | 6 ------
.../craftbukkit/entity/CraftAreaEffectCloud.java | 6 ------
.../bukkit/craftbukkit/entity/CraftArmorStand.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftArrow.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftAxolotl.java | 6 ------
.../java/org/bukkit/craftbukkit/entity/CraftBat.java | 6 ------
.../java/org/bukkit/craftbukkit/entity/CraftBee.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftBlaze.java | 6 ------
.../bukkit/craftbukkit/entity/CraftBlockDisplay.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftBoat.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftCamel.java | 6 ------
.../java/org/bukkit/craftbukkit/entity/CraftCat.java | 6 ------
.../bukkit/craftbukkit/entity/CraftCaveSpider.java | 6 ------
.../bukkit/craftbukkit/entity/CraftChestBoat.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftChicken.java | 6 ------
.../java/org/bukkit/craftbukkit/entity/CraftCod.java | 6 ------
.../bukkit/craftbukkit/entity/CraftComplexPart.java | 6 ------
.../java/org/bukkit/craftbukkit/entity/CraftCow.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftCreeper.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftDisplay.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftDolphin.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftDonkey.java | 6 ------
.../craftbukkit/entity/CraftDragonFireball.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftDrowned.java | 6 ------
.../java/org/bukkit/craftbukkit/entity/CraftEgg.java | 6 ------
.../craftbukkit/entity/CraftElderGuardian.java | 6 ------
.../bukkit/craftbukkit/entity/CraftEnderCrystal.java | 6 ------
.../bukkit/craftbukkit/entity/CraftEnderDragon.java | 6 ------
.../bukkit/craftbukkit/entity/CraftEnderPearl.java | 6 ------
.../bukkit/craftbukkit/entity/CraftEnderSignal.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftEnderman.java | 6 ------
.../bukkit/craftbukkit/entity/CraftEndermite.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftEntity.java | 12 ++++++++++++
.../org/bukkit/craftbukkit/entity/CraftEvoker.java | 6 ------
.../bukkit/craftbukkit/entity/CraftEvokerFangs.java | 6 ------
.../craftbukkit/entity/CraftExperienceOrb.java | 6 ------
.../bukkit/craftbukkit/entity/CraftFallingBlock.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftFireball.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftFirework.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftFishHook.java | 6 ------
.../java/org/bukkit/craftbukkit/entity/CraftFox.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftFrog.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftGhast.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftGiant.java | 6 ------
.../craftbukkit/entity/CraftGlowItemFrame.java | 6 ------
.../bukkit/craftbukkit/entity/CraftGlowSquid.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftGoat.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftGuardian.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftHanging.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftHoglin.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftHorse.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftHusk.java | 6 ------
.../bukkit/craftbukkit/entity/CraftIllusioner.java | 6 ------
.../bukkit/craftbukkit/entity/CraftInteraction.java | 6 ------
.../bukkit/craftbukkit/entity/CraftIronGolem.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftItem.java | 6 ------
.../bukkit/craftbukkit/entity/CraftItemDisplay.java | 6 ------
.../bukkit/craftbukkit/entity/CraftItemFrame.java | 6 ------
.../craftbukkit/entity/CraftLargeFireball.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftLeash.java | 6 ------
.../craftbukkit/entity/CraftLightningStrike.java | 6 ------
.../bukkit/craftbukkit/entity/CraftLivingEntity.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftLlama.java | 6 ------
.../bukkit/craftbukkit/entity/CraftLlamaSpit.java | 6 ------
.../bukkit/craftbukkit/entity/CraftMagmaCube.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftMarker.java | 6 ------
.../craftbukkit/entity/CraftMinecartChest.java | 6 ------
.../craftbukkit/entity/CraftMinecartCommand.java | 6 ------
.../craftbukkit/entity/CraftMinecartFurnace.java | 6 ------
.../craftbukkit/entity/CraftMinecartHopper.java | 6 ------
.../craftbukkit/entity/CraftMinecartMobSpawner.java | 6 ------
.../craftbukkit/entity/CraftMinecartRideable.java | 6 ------
.../bukkit/craftbukkit/entity/CraftMinecartTNT.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftMule.java | 6 ------
.../bukkit/craftbukkit/entity/CraftMushroomCow.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftOcelot.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftPainting.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftPanda.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftParrot.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftPhantom.java | 6 ------
.../java/org/bukkit/craftbukkit/entity/CraftPig.java | 6 ------
.../bukkit/craftbukkit/entity/CraftPigZombie.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftPiglin.java | 6 ------
.../bukkit/craftbukkit/entity/CraftPiglinBrute.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftPillager.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftPlayer.java | 5 -----
.../bukkit/craftbukkit/entity/CraftPolarBear.java | 6 ------
.../bukkit/craftbukkit/entity/CraftPufferFish.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftRabbit.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftRavager.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftSalmon.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftSheep.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftShulker.java | 6 ------
.../craftbukkit/entity/CraftShulkerBullet.java | 6 ------
.../bukkit/craftbukkit/entity/CraftSilverfish.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftSkeleton.java | 6 ------
.../craftbukkit/entity/CraftSkeletonHorse.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftSlime.java | 6 ------
.../craftbukkit/entity/CraftSmallFireball.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftSniffer.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftSnowball.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftSnowman.java | 6 ------
.../craftbukkit/entity/CraftSpectralArrow.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftSpider.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftSquid.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftStray.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftStrider.java | 6 ------
.../bukkit/craftbukkit/entity/CraftTNTPrimed.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftTadpole.java | 6 ------
.../bukkit/craftbukkit/entity/CraftTextDisplay.java | 6 ------
.../craftbukkit/entity/CraftThrownExpBottle.java | 6 ------
.../bukkit/craftbukkit/entity/CraftThrownPotion.java | 6 ------
.../bukkit/craftbukkit/entity/CraftTippedArrow.java | 6 ------
.../bukkit/craftbukkit/entity/CraftTraderLlama.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftTrident.java | 6 ------
.../bukkit/craftbukkit/entity/CraftTropicalFish.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftTurtle.java | 6 ------
.../java/org/bukkit/craftbukkit/entity/CraftVex.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftVillager.java | 6 ------
.../craftbukkit/entity/CraftVillagerZombie.java | 6 ------
.../bukkit/craftbukkit/entity/CraftVindicator.java | 6 ------
.../craftbukkit/entity/CraftWanderingTrader.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftWarden.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftWitch.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftWither.java | 6 ------
.../craftbukkit/entity/CraftWitherSkeleton.java | 6 ------
.../bukkit/craftbukkit/entity/CraftWitherSkull.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftWolf.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftZoglin.java | 6 ------
.../org/bukkit/craftbukkit/entity/CraftZombie.java | 6 ------
.../bukkit/craftbukkit/entity/CraftZombieHorse.java | 6 ------
132 files changed, 12 insertions(+), 785 deletions(-)
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 b8e0676a47..56884f6530 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
@@ -8,7 +8,6 @@ import org.bukkit.Material;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.inventory.CraftInventory;
import org.bukkit.craftbukkit.util.CraftLocation;
-import org.bukkit.entity.EntityType;
import org.bukkit.inventory.Inventory;
public class CraftAllay extends CraftCreature implements org.bukkit.entity.Allay {
@@ -27,11 +26,6 @@ public class CraftAllay extends CraftCreature implements org.bukkit.entity.Allay
return "CraftAllay";
}
- @Override
- public EntityType getType() {
- return EntityType.ALLAY;
- }
-
@Override
public Inventory getInventory() {
return new CraftInventory(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 235c9b81f5..7f0ba4f5e5 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
@@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.ambient.EntityAmbient;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Ambient;
-import org.bukkit.entity.EntityType;
public class CraftAmbient extends CraftMob implements Ambient {
public CraftAmbient(CraftServer server, EntityAmbient entity) {
@@ -19,9 +18,4 @@ public class CraftAmbient extends CraftMob implements Ambient {
public String toString() {
return "CraftAmbient";
}
-
- @Override
- public EntityType getType() {
- return EntityType.UNKNOWN;
- }
}
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 02f664aaa3..3259b2c972 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
@@ -15,7 +15,6 @@ import org.bukkit.craftbukkit.CraftParticle;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.potion.CraftPotionUtil;
import org.bukkit.entity.AreaEffectCloud;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity;
import org.bukkit.potion.PotionData;
import org.bukkit.potion.PotionEffect;
@@ -38,11 +37,6 @@ public class CraftAreaEffectCloud extends CraftEntity implements AreaEffectCloud
return "CraftAreaEffectCloud";
}
- @Override
- public EntityType getType() {
- return EntityType.AREA_EFFECT_CLOUD;
- }
-
@Override
public int getDuration() {
return getHandle().getDuration();
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 6a8557724e..f4534bf39a 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
@@ -6,7 +6,6 @@ import org.bukkit.craftbukkit.CraftEquipmentSlot;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.ArmorStand;
import org.bukkit.entity.ArmorStand.LockType;
-import org.bukkit.entity.EntityType;
import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.inventory.ItemStack;
import org.bukkit.util.EulerAngle;
@@ -22,11 +21,6 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
return "CraftArmorStand";
}
- @Override
- public EntityType getType() {
- return EntityType.ARMOR_STAND;
- }
-
@Override
public EntityArmorStand getHandle() {
return (EntityArmorStand) super.getHandle();
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 dc0dd14b36..bc2b09d507 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
@@ -7,7 +7,6 @@ import org.bukkit.block.Block;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.AbstractArrow;
import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
import org.bukkit.projectiles.ProjectileSource;
public class CraftArrow extends AbstractProjectile implements AbstractArrow {
@@ -128,9 +127,4 @@ public class CraftArrow extends AbstractProjectile implements AbstractArrow {
public String toString() {
return "CraftArrow";
}
-
- @Override
- public EntityType getType() {
- return EntityType.UNKNOWN;
- }
}
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 4e69b6427f..366f573c0b 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
@@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import com.google.common.base.Preconditions;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Axolotl;
-import org.bukkit.entity.EntityType;
public class CraftAxolotl extends CraftAnimals implements Axolotl {
@@ -16,11 +15,6 @@ public class CraftAxolotl extends CraftAnimals implements Axolotl {
return (net.minecraft.world.entity.animal.axolotl.Axolotl) super.getHandle();
}
- @Override
- public EntityType getType() {
- return EntityType.AXOLOTL;
- }
-
@Override
public String toString() {
return "CraftAxolotl";
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 8e34b8dd81..5f633d633b 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
@@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.ambient.EntityBat;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Bat;
-import org.bukkit.entity.EntityType;
public class CraftBat extends CraftAmbient implements Bat {
public CraftBat(CraftServer server, EntityBat entity) {
@@ -20,11 +19,6 @@ public class CraftBat extends CraftAmbient implements Bat {
return "CraftBat";
}
- @Override
- public EntityType getType() {
- return EntityType.BAT;
- }
-
@Override
public boolean isAwake() {
return !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 c558462aa1..280706a32c 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
@@ -7,7 +7,6 @@ import org.bukkit.Location;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.util.CraftLocation;
import org.bukkit.entity.Bee;
-import org.bukkit.entity.EntityType;
public class CraftBee extends CraftAnimals implements Bee {
@@ -25,11 +24,6 @@ public class CraftBee extends CraftAnimals implements Bee {
return "CraftBee";
}
- @Override
- public EntityType getType() {
- return EntityType.BEE;
- }
-
@Override
public Location getHive() {
BlockPosition hive = 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 c5800e2453..973d8b8988 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
@@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntityBlaze;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Blaze;
-import org.bukkit.entity.EntityType;
public class CraftBlaze extends CraftMonster implements Blaze {
public CraftBlaze(CraftServer server, EntityBlaze entity) {
@@ -19,9 +18,4 @@ public class CraftBlaze extends CraftMonster implements Blaze {
public String toString() {
return "CraftBlaze";
}
-
- @Override
- public EntityType getType() {
- return EntityType.BLAZE;
- }
}
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 a965dc7b8b..a2095d5ded 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
@@ -5,7 +5,6 @@ import org.bukkit.block.data.BlockData;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.block.data.CraftBlockData;
import org.bukkit.entity.BlockDisplay;
-import org.bukkit.entity.EntityType;
public class CraftBlockDisplay extends CraftDisplay implements BlockDisplay {
@@ -23,11 +22,6 @@ public class CraftBlockDisplay extends CraftDisplay implements BlockDisplay {
return "CraftBlockDisplay";
}
- @Override
- public EntityType getType() {
- return EntityType.BLOCK_DISPLAY;
- }
-
@Override
public BlockData getBlock() {
return CraftBlockData.fromData(getHandle().getBlockState());
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 21dc6e1e45..1eb6d2a125 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
@@ -7,7 +7,6 @@ import org.bukkit.TreeSpecies;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Boat;
import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
public class CraftBoat extends CraftVehicle implements Boat {
@@ -96,11 +95,6 @@ public class CraftBoat extends CraftVehicle implements Boat {
return "CraftBoat{boatType=" + getBoatType() + ",status=" + getStatus() + ",passengers=" + getPassengers().stream().map(Entity::toString).collect(Collectors.joining("-", "{", "}")) + "}";
}
- @Override
- public EntityType getType() {
- return EntityType.BOAT;
- }
-
public static Boat.Type boatTypeFromNms(EntityBoat.EnumBoatType boatType) {
return switch (boatType) {
default -> throw new EnumConstantNotPresentException(Type.class, boatType.name());
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 c765139d22..ee0727ce6c 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
@@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.EntityPose;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Camel;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Horse;
public class CraftCamel extends CraftAbstractHorse implements Camel {
@@ -22,11 +21,6 @@ public class CraftCamel extends CraftAbstractHorse implements Camel {
return "CraftCamel";
}
- @Override
- public EntityType getType() {
- return EntityType.CAMEL;
- }
-
@Override
public Horse.Variant getVariant() {
return Horse.Variant.CAMEL;
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 3498bac145..e2ad24ac5f 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
@@ -8,7 +8,6 @@ import org.bukkit.DyeColor;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Cat;
import org.bukkit.entity.Cat.Type;
-import org.bukkit.entity.EntityType;
public class CraftCat extends CraftTameableAnimal implements Cat {
@@ -21,11 +20,6 @@ public class CraftCat extends CraftTameableAnimal implements Cat {
return (EntityCat) super.getHandle();
}
- @Override
- public EntityType getType() {
- return EntityType.CAT;
- }
-
@Override
public String toString() {
return "CraftCat";
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 f4e11cbbc2..bc780cd073 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
@@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntityCaveSpider;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.CaveSpider;
-import org.bukkit.entity.EntityType;
public class CraftCaveSpider extends CraftSpider implements CaveSpider {
public CraftCaveSpider(CraftServer server, EntityCaveSpider entity) {
@@ -19,9 +18,4 @@ public class CraftCaveSpider extends CraftSpider implements CaveSpider {
public String toString() {
return "CraftCaveSpider";
}
-
- @Override
- public EntityType getType() {
- return EntityType.CAVE_SPIDER;
- }
}
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 032cbc5beb..85e77459aa 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
@@ -7,7 +7,6 @@ import org.bukkit.NamespacedKey;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.inventory.CraftInventory;
import org.bukkit.craftbukkit.util.CraftNamespacedKey;
-import org.bukkit.entity.EntityType;
import org.bukkit.inventory.Inventory;
import org.bukkit.loot.LootTable;
@@ -30,11 +29,6 @@ public class CraftChestBoat extends CraftBoat implements org.bukkit.entity.Chest
return "CraftChestBoat";
}
- @Override
- public EntityType getType() {
- return EntityType.CHEST_BOAT;
- }
-
@Override
public Inventory getInventory() {
return inventory;
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 45976e453d..0cd521678e 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
@@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.animal.EntityChicken;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Chicken;
-import org.bukkit.entity.EntityType;
public class CraftChicken extends CraftAnimals implements Chicken {
@@ -20,9 +19,4 @@ public class CraftChicken extends CraftAnimals implements Chicken {
public String toString() {
return "CraftChicken";
}
-
- @Override
- public EntityType getType() {
- return EntityType.CHICKEN;
- }
}
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 c9705064ca..a656284231 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
@@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.animal.EntityCod;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Cod;
-import org.bukkit.entity.EntityType;
public class CraftCod extends CraftFish implements Cod {
@@ -20,9 +19,4 @@ public class CraftCod extends CraftFish implements Cod {
public String toString() {
return "CraftCod";
}
-
- @Override
- public EntityType getType() {
- return EntityType.COD;
- }
}
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 b3d62532cb..6b43294c66 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
@@ -5,7 +5,6 @@ import net.minecraft.world.entity.boss.enderdragon.EntityEnderDragon;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.ComplexEntityPart;
import org.bukkit.entity.ComplexLivingEntity;
-import org.bukkit.entity.EntityType;
import org.bukkit.event.entity.EntityDamageEvent;
public class CraftComplexPart extends CraftEntity implements ComplexEntityPart {
@@ -42,9 +41,4 @@ public class CraftComplexPart extends CraftEntity implements ComplexEntityPart {
public String toString() {
return "CraftComplexPart";
}
-
- @Override
- public EntityType getType() {
- return EntityType.UNKNOWN;
- }
}
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 fcfef870be..ac0143a69b 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
@@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.animal.EntityCow;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Cow;
-import org.bukkit.entity.EntityType;
public class CraftCow extends CraftAnimals implements Cow {
@@ -20,9 +19,4 @@ public class CraftCow extends CraftAnimals implements Cow {
public String toString() {
return "CraftCow";
}
-
- @Override
- public EntityType getType() {
- return EntityType.COW;
- }
}
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 3068e8467e..1228c7b1c4 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
@@ -4,7 +4,6 @@ import com.google.common.base.Preconditions;
import net.minecraft.world.entity.monster.EntityCreeper;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Creeper;
-import org.bukkit.entity.EntityType;
import org.bukkit.event.entity.CreeperPowerEvent;
public class CraftCreeper extends CraftMonster implements Creeper {
@@ -90,9 +89,4 @@ public class CraftCreeper extends CraftMonster implements Creeper {
public String toString() {
return "CraftCreeper";
}
-
- @Override
- public EntityType getType() {
- return EntityType.CREEPER;
- }
}
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 a8c3803bbb..e4947785a3 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
@@ -4,7 +4,6 @@ import com.google.common.base.Preconditions;
import org.bukkit.Color;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Display;
-import org.bukkit.entity.EntityType;
import org.bukkit.util.Transformation;
public class CraftDisplay extends CraftEntity implements Display {
@@ -23,11 +22,6 @@ public class CraftDisplay extends CraftEntity implements Display {
return "CraftDisplay";
}
- @Override
- public EntityType getType() {
- return EntityType.UNKNOWN;
- }
-
@Override
public Transformation getTransformation() {
com.mojang.math.Transformation nms = net.minecraft.world.entity.Display.createTransformation(getHandle().getEntityData());
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 63ec66e302..12b316b58b 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
@@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.animal.EntityDolphin;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Dolphin;
-import org.bukkit.entity.EntityType;
public class CraftDolphin extends CraftWaterMob implements Dolphin {
@@ -20,9 +19,4 @@ public class CraftDolphin extends CraftWaterMob implements Dolphin {
public String toString() {
return "CraftDolphin";
}
-
- @Override
- public EntityType getType() {
- return EntityType.DOLPHIN;
- }
}
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 35bfc09558..9b534229dd 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
@@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.animal.horse.EntityHorseDonkey;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Donkey;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Horse.Variant;
public class CraftDonkey extends CraftChestedHorse implements Donkey {
@@ -17,11 +16,6 @@ public class CraftDonkey extends CraftChestedHorse implements Donkey {
return "CraftDonkey";
}
- @Override
- public EntityType getType() {
- return EntityType.DONKEY;
- }
-
@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 322b7434aa..1ab864f3e8 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
@@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.projectile.EntityDragonFireball;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.DragonFireball;
-import org.bukkit.entity.EntityType;
public class CraftDragonFireball extends CraftFireball implements DragonFireball {
public CraftDragonFireball(CraftServer server, EntityDragonFireball entity) {
@@ -14,9 +13,4 @@ public class CraftDragonFireball extends CraftFireball implements DragonFireball
public String toString() {
return "CraftDragonFireball";
}
-
- @Override
- public EntityType getType() {
- return EntityType.DRAGON_FIREBALL;
- }
}
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 3bb39dae11..ea524837ec 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
@@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntityDrowned;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Drowned;
-import org.bukkit.entity.EntityType;
public class CraftDrowned extends CraftZombie implements Drowned {
@@ -20,9 +19,4 @@ public class CraftDrowned extends CraftZombie implements Drowned {
public String toString() {
return "CraftDrowned";
}
-
- @Override
- public EntityType getType() {
- return EntityType.DROWNED;
- }
}
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 865e260fc6..fe3dbd1319 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
@@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.projectile.EntityEgg;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Egg;
-import org.bukkit.entity.EntityType;
public class CraftEgg extends CraftThrowableProjectile implements Egg {
public CraftEgg(CraftServer server, EntityEgg entity) {
@@ -19,9 +18,4 @@ public class CraftEgg extends CraftThrowableProjectile implements Egg {
public String toString() {
return "CraftEgg";
}
-
- @Override
- public EntityType getType() {
- return EntityType.EGG;
- }
}
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 c0f1dc5195..91d954f684 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
@@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntityGuardianElder;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.ElderGuardian;
-import org.bukkit.entity.EntityType;
public class CraftElderGuardian extends CraftGuardian implements ElderGuardian {
@@ -16,11 +15,6 @@ public class CraftElderGuardian extends CraftGuardian implements ElderGuardian {
return "CraftElderGuardian";
}
- @Override
- public EntityType getType() {
- return EntityType.ELDER_GUARDIAN;
- }
-
@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 c8f2af0248..13d68f0e93 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
@@ -6,7 +6,6 @@ import org.bukkit.Location;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.util.CraftLocation;
import org.bukkit.entity.EnderCrystal;
-import org.bukkit.entity.EntityType;
public class CraftEnderCrystal extends CraftEntity implements EnderCrystal {
public CraftEnderCrystal(CraftServer server, EntityEnderCrystal entity) {
@@ -49,9 +48,4 @@ public class CraftEnderCrystal extends CraftEntity implements EnderCrystal {
public String toString() {
return "CraftEnderCrystal";
}
-
- @Override
- public EntityType getType() {
- return EntityType.ENDER_CRYSTAL;
- }
}
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 b81907b45b..e676b2ef66 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
@@ -13,7 +13,6 @@ import org.bukkit.craftbukkit.boss.CraftDragonBattle;
import org.bukkit.entity.ComplexEntityPart;
import org.bukkit.entity.EnderDragon;
import org.bukkit.entity.EnderDragon.Phase;
-import org.bukkit.entity.EntityType;
public class CraftEnderDragon extends CraftMob implements EnderDragon, CraftEnemy {
@@ -42,11 +41,6 @@ public class CraftEnderDragon extends CraftMob implements EnderDragon, CraftEnem
return "CraftEnderDragon";
}
- @Override
- public EntityType getType() {
- return EntityType.ENDER_DRAGON;
- }
-
@Override
public Phase getPhase() {
return Phase.values()[getHandle().getEntityData().get(EntityEnderDragon.DATA_PHASE)];
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 6e4e5da55f..5d7e5f798e 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
@@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.projectile.EntityEnderPearl;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EnderPearl;
-import org.bukkit.entity.EntityType;
public class CraftEnderPearl extends CraftThrowableProjectile implements EnderPearl {
public CraftEnderPearl(CraftServer server, EntityEnderPearl entity) {
@@ -19,9 +18,4 @@ public class CraftEnderPearl extends CraftThrowableProjectile implements EnderPe
public String toString() {
return "CraftEnderPearl";
}
-
- @Override
- public EntityType getType() {
- return EntityType.ENDER_PEARL;
- }
}
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 b08f2ef53d..c6a66fcb58 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
@@ -9,7 +9,6 @@ import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.inventory.CraftItemStack;
import org.bukkit.craftbukkit.util.CraftLocation;
import org.bukkit.entity.EnderSignal;
-import org.bukkit.entity.EntityType;
import org.bukkit.inventory.ItemStack;
public class CraftEnderSignal extends CraftEntity implements EnderSignal {
@@ -27,11 +26,6 @@ public class CraftEnderSignal extends CraftEntity implements EnderSignal {
return "CraftEnderSignal";
}
- @Override
- public EntityType getType() {
- return EntityType.ENDER_SIGNAL;
- }
-
@Override
public Location getTargetLocation() {
return new Location(getWorld(), getHandle().tx, getHandle().ty, getHandle().tz, getHandle().getYRot(), 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 89e44756fa..05441b8611 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
@@ -10,7 +10,6 @@ import org.bukkit.craftbukkit.block.data.CraftBlockData;
import org.bukkit.craftbukkit.util.CraftMagicNumbers;
import org.bukkit.entity.Enderman;
import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
import org.bukkit.material.MaterialData;
public class CraftEnderman extends CraftMonster implements Enderman {
@@ -50,11 +49,6 @@ public class CraftEnderman extends CraftMonster implements Enderman {
return "CraftEnderman";
}
- @Override
- public EntityType getType() {
- return EntityType.ENDERMAN;
- }
-
@Override
public boolean teleport() {
return 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 5d743f8b63..bb72a1a733 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
@@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntityEndermite;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Endermite;
-import org.bukkit.entity.EntityType;
public class CraftEndermite extends CraftMonster implements Endermite {
@@ -21,11 +20,6 @@ public class CraftEndermite extends CraftMonster implements Endermite {
return "CraftEndermite";
}
- @Override
- public EntityType getType() {
- return EntityType.ENDERMITE;
- }
-
@Override
public boolean isPlayerSpawned() {
return false;
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 30fe9e0079..b4dcaf77a1 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
@@ -23,6 +23,7 @@ import net.minecraft.world.entity.EntityFlying;
import net.minecraft.world.entity.EntityLightning;
import net.minecraft.world.entity.EntityLiving;
import net.minecraft.world.entity.EntityTameableAnimal;
+import net.minecraft.world.entity.EntityTypes;
import net.minecraft.world.entity.GlowSquid;
import net.minecraft.world.entity.Interaction;
import net.minecraft.world.entity.Marker;
@@ -163,6 +164,7 @@ import net.minecraft.world.entity.vehicle.EntityMinecartTNT;
import net.minecraft.world.phys.AxisAlignedBB;
import org.bukkit.EntityEffect;
import org.bukkit.Location;
+import org.bukkit.Registry;
import org.bukkit.Server;
import org.bukkit.Sound;
import org.bukkit.World;
@@ -176,8 +178,10 @@ import org.bukkit.craftbukkit.persistence.CraftPersistentDataContainer;
import org.bukkit.craftbukkit.persistence.CraftPersistentDataTypeRegistry;
import org.bukkit.craftbukkit.util.CraftChatMessage;
import org.bukkit.craftbukkit.util.CraftLocation;
+import org.bukkit.craftbukkit.util.CraftNamespacedKey;
import org.bukkit.craftbukkit.util.CraftSpawnCategory;
import org.bukkit.craftbukkit.util.CraftVector;
+import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import org.bukkit.entity.Pose;
import org.bukkit.entity.SpawnCategory;
@@ -200,12 +204,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
protected final CraftServer server;
protected Entity entity;
+ private final EntityType entityType;
private EntityDamageEvent lastDamageEvent;
private final CraftPersistentDataContainer persistentDataContainer = new CraftPersistentDataContainer(DATA_TYPE_REGISTRY);
public CraftEntity(final CraftServer server, final Entity entity) {
this.server = server;
this.entity = entity;
+ EntityType type = Registry.ENTITY_TYPE.get(CraftNamespacedKey.fromMinecraft(EntityTypes.getKey(entity.getType())));
+ this.entityType = (type != null) ? type : EntityType.UNKNOWN;
}
public static CraftEntity getEntity(CraftServer server, Entity entity) {
@@ -755,6 +762,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return entity;
}
+ @Override
+ public final EntityType getType() {
+ return entityType;
+ }
+
@Override
public void playEffect(EntityEffect type) {
Preconditions.checkArgument(type != null, "type");
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 fb490be8ef..d5d3766824 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
@@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntityEvoker;
import net.minecraft.world.entity.monster.EntityIllagerWizard;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Evoker;
public class CraftEvoker extends CraftSpellcaster implements Evoker {
@@ -22,11 +21,6 @@ public class CraftEvoker extends CraftSpellcaster implements Evoker {
return "CraftEvoker";
}
- @Override
- public EntityType getType() {
- return EntityType.EVOKER;
- }
-
@Override
public Evoker.Spell getCurrentSpell() {
return Evoker.Spell.values()[getHandle().getCurrentSpell().ordinal()];
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 19c42371de..a95b04a1e6 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
@@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.EntityLiving;
import net.minecraft.world.entity.projectile.EntityEvokerFangs;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.EvokerFangs;
import org.bukkit.entity.LivingEntity;
@@ -23,11 +22,6 @@ public class CraftEvokerFangs extends CraftEntity implements EvokerFangs {
return "CraftEvokerFangs";
}
- @Override
- public EntityType getType() {
- return EntityType.EVOKER_FANGS;
- }
-
@Override
public LivingEntity getOwner() {
EntityLiving owner = getHandle().getOwner();
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 da14f59aec..c3524a3bc7 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.EntityExperienceOrb;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.ExperienceOrb;
public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb {
@@ -29,9 +28,4 @@ public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb {
public String toString() {
return "CraftExperienceOrb";
}
-
- @Override
- public EntityType getType() {
- return EntityType.EXPERIENCE_ORB;
- }
}
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 59314c0c26..b5b6ce63f7 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
@@ -6,7 +6,6 @@ import org.bukkit.Material;
import org.bukkit.block.data.BlockData;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.block.data.CraftBlockData;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.FallingBlock;
public class CraftFallingBlock extends CraftEntity implements FallingBlock {
@@ -25,11 +24,6 @@ public class CraftFallingBlock extends CraftEntity implements FallingBlock {
return "CraftFallingBlock";
}
- @Override
- public EntityType getType() {
- return EntityType.FALLING_BLOCK;
- }
-
@Override
public Material getMaterial() {
return 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 64e766f5b4..b0ff11b409 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
@@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import com.google.common.base.Preconditions;
import net.minecraft.world.entity.projectile.EntityFireball;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Fireball;
import org.bukkit.projectiles.ProjectileSource;
import org.bukkit.util.Vector;
@@ -69,9 +68,4 @@ public class CraftFireball extends AbstractProjectile implements Fireball {
public String toString() {
return "CraftFireball";
}
-
- @Override
- public EntityType getType() {
- return EntityType.UNKNOWN;
- }
}
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 27ddb27ec6..cb76204dd3 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
@@ -9,7 +9,6 @@ import net.minecraft.world.item.Items;
import org.bukkit.Material;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.inventory.CraftItemStack;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Firework;
import org.bukkit.entity.LivingEntity;
import org.bukkit.inventory.meta.FireworkMeta;
@@ -47,11 +46,6 @@ public class CraftFirework extends CraftProjectile implements Firework {
return "CraftFirework";
}
- @Override
- public EntityType getType() {
- return EntityType.FIREWORK;
- }
-
@Override
public FireworkMeta getFireworkMeta() {
return (FireworkMeta) item.getItemMeta();
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 fda83e13f3..4b010e5322 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
@@ -5,7 +5,6 @@ import net.minecraft.core.BlockPosition;
import net.minecraft.world.entity.projectile.EntityFishingHook;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.FishHook;
public class CraftFishHook extends CraftProjectile implements FishHook {
@@ -25,11 +24,6 @@ public class CraftFishHook extends CraftProjectile implements FishHook {
return "CraftFishingHook";
}
- @Override
- public EntityType getType() {
- return EntityType.FISHING_HOOK;
- }
-
@Override
public int getMinWaitTime() {
return getHandle().minWaitTime;
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 909513c50f..efcb213ea6 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
@@ -6,7 +6,6 @@ import java.util.UUID;
import net.minecraft.world.entity.animal.EntityFox;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.AnimalTamer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Fox;
import org.bukkit.entity.Fox.Type;
@@ -21,11 +20,6 @@ public class CraftFox extends CraftAnimals implements Fox {
return (EntityFox) super.getHandle();
}
- @Override
- public EntityType getType() {
- return EntityType.FOX;
- }
-
@Override
public String toString() {
return "CraftFox";
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 2371aca0b3..426327c336 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
@@ -7,7 +7,6 @@ import org.bukkit.Registry;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.util.CraftNamespacedKey;
import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
public class CraftFrog extends CraftAnimals implements org.bukkit.entity.Frog {
@@ -25,11 +24,6 @@ public class CraftFrog extends CraftAnimals implements org.bukkit.entity.Frog {
return "CraftFrog";
}
- @Override
- public EntityType getType() {
- return EntityType.FROG;
- }
-
@Override
public Entity getTongueTarget() {
return 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 ed47774fb8..c3fc57a2c5 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntityGhast;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Ghast;
public class CraftGhast extends CraftFlying implements Ghast, CraftEnemy {
@@ -21,11 +20,6 @@ public class CraftGhast extends CraftFlying implements Ghast, CraftEnemy {
return "CraftGhast";
}
- @Override
- public EntityType getType() {
- return EntityType.GHAST;
- }
-
@Override
public boolean isCharging() {
return 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 95cfa87ccb..c06fe4c054 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntityGiantZombie;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Giant;
public class CraftGiant extends CraftMonster implements Giant {
@@ -20,9 +19,4 @@ public class CraftGiant extends CraftMonster implements Giant {
public String toString() {
return "CraftGiant";
}
-
- @Override
- public EntityType getType() {
- return EntityType.GIANT;
- }
}
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 f507b6bd99..7dd9d670a1 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
@@ -1,7 +1,6 @@
package org.bukkit.craftbukkit.entity;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.GlowItemFrame;
public class CraftGlowItemFrame extends CraftItemFrame implements GlowItemFrame {
@@ -15,11 +14,6 @@ public class CraftGlowItemFrame extends CraftItemFrame implements GlowItemFrame
return (net.minecraft.world.entity.decoration.GlowItemFrame) super.getHandle();
}
- @Override
- public EntityType getType() {
- return EntityType.GLOW_ITEM_FRAME;
- }
-
@Override
public String toString() {
return "CraftGlowItemFrame{item=" + getItem() + ", rotation=" + getRotation() + "}";
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 44ba04c3fa..21a0da5260 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import com.google.common.base.Preconditions;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.GlowSquid;
public class CraftGlowSquid extends CraftSquid implements GlowSquid {
@@ -16,11 +15,6 @@ public class CraftGlowSquid extends CraftSquid implements GlowSquid {
return (net.minecraft.world.entity.GlowSquid) super.getHandle();
}
- @Override
- public EntityType getType() {
- return EntityType.GLOW_SQUID;
- }
-
@Override
public String toString() {
return "CraftGlowSquid";
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 a203a32fc2..a07106ddb4 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
@@ -1,7 +1,6 @@
package org.bukkit.craftbukkit.entity;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Goat;
public class CraftGoat extends CraftAnimals implements Goat {
@@ -15,11 +14,6 @@ public class CraftGoat extends CraftAnimals implements Goat {
return (net.minecraft.world.entity.animal.goat.Goat) super.getHandle();
}
- @Override
- public EntityType getType() {
- return EntityType.GOAT;
- }
-
@Override
public String toString() {
return "CraftGoat";
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 00ee47d7cb..b1ad0243b7 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
@@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import com.google.common.base.Preconditions;
import net.minecraft.world.entity.monster.EntityGuardian;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Guardian;
import org.bukkit.entity.LivingEntity;
@@ -25,11 +24,6 @@ public class CraftGuardian extends CraftMonster implements Guardian {
return "CraftGuardian";
}
- @Override
- public EntityType getType() {
- return EntityType.GUARDIAN;
- }
-
@Override
public void setTarget(LivingEntity target) {
super.setTarget(target);
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 4f6b924f55..8734dbb619 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
@@ -5,7 +5,6 @@ import net.minecraft.world.entity.decoration.EntityHanging;
import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.block.CraftBlock;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Hanging;
public class CraftHanging extends CraftEntity implements Hanging {
@@ -67,9 +66,4 @@ public class CraftHanging extends CraftEntity implements Hanging {
public String toString() {
return "CraftHanging";
}
-
- @Override
- public EntityType getType() {
- return EntityType.UNKNOWN;
- }
}
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 4ecfed1136..0a5391b08e 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
@@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import com.google.common.base.Preconditions;
import net.minecraft.world.entity.monster.hoglin.EntityHoglin;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Hoglin;
public class CraftHoglin extends CraftAnimals implements Hoglin, CraftEnemy {
@@ -62,9 +61,4 @@ public class CraftHoglin extends CraftAnimals implements Hoglin, CraftEnemy {
public String toString() {
return "CraftHoglin";
}
-
- @Override
- public EntityType getType() {
- return EntityType.HOGLIN;
- }
}
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 27a525be87..1f465ea9fc 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
@@ -6,7 +6,6 @@ import net.minecraft.world.entity.animal.horse.HorseColor;
import net.minecraft.world.entity.animal.horse.HorseStyle;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.inventory.CraftInventoryHorse;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Horse;
import org.bukkit.inventory.HorseInventory;
@@ -67,9 +66,4 @@ public class CraftHorse extends CraftAbstractHorse implements Horse {
public String toString() {
return "CraftHorse{variant=" + getVariant() + ", owner=" + getOwner() + '}';
}
-
- @Override
- public EntityType getType() {
- return EntityType.HORSE;
- }
}
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 d0f3166ef0..76f4d809f4 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntityZombieHusk;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Husk;
public class CraftHusk extends CraftZombie implements Husk {
@@ -15,9 +14,4 @@ public class CraftHusk extends CraftZombie implements Husk {
public String toString() {
return "CraftHusk";
}
-
- @Override
- public EntityType getType() {
- return EntityType.HUSK;
- }
}
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 0dabb012b3..b4116f6b83 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntityIllagerIllusioner;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Illusioner;
public class CraftIllusioner extends CraftSpellcaster implements Illusioner {
@@ -20,9 +19,4 @@ public class CraftIllusioner extends CraftSpellcaster implements Illusioner {
public String toString() {
return "CraftIllusioner";
}
-
- @Override
- public EntityType getType() {
- return EntityType.ILLUSIONER;
- }
}
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 74ca421147..d60ad11733 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
@@ -4,7 +4,6 @@ import java.util.UUID;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Interaction;
public class CraftInteraction extends CraftEntity implements Interaction {
@@ -23,11 +22,6 @@ public class CraftInteraction extends CraftEntity implements Interaction {
return "CraftInteraction";
}
- @Override
- public EntityType getType() {
- return EntityType.INTERACTION;
- }
-
@Override
public float getInteractionWidth() {
return getHandle().getWidth();
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 69fe6c47cc..cb60fe8bfd 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.animal.EntityIronGolem;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.IronGolem;
public class CraftIronGolem extends CraftGolem implements IronGolem {
@@ -29,9 +28,4 @@ public class CraftIronGolem extends CraftGolem implements IronGolem {
public void setPlayerCreated(boolean playerCreated) {
getHandle().setPlayerCreated(playerCreated);
}
-
- @Override
- public EntityType getType() {
- return EntityType.IRON_GOLEM;
- }
}
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 b468361092..7ed19a639a 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
@@ -5,7 +5,6 @@ import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.item.EntityItem;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.inventory.CraftItemStack;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Item;
import org.bukkit.inventory.ItemStack;
@@ -90,9 +89,4 @@ public class CraftItem extends CraftEntity implements Item {
public String toString() {
return "CraftItem";
}
-
- @Override
- public EntityType getType() {
- return EntityType.DROPPED_ITEM;
- }
}
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 81b4a56d3c..fbfdbe31f3 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
@@ -4,7 +4,6 @@ import com.google.common.base.Preconditions;
import net.minecraft.world.item.ItemDisplayContext;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.inventory.CraftItemStack;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.ItemDisplay;
import org.bukkit.inventory.ItemStack;
@@ -24,11 +23,6 @@ public class CraftItemDisplay extends CraftDisplay implements ItemDisplay {
return "CraftItemDisplay";
}
- @Override
- public EntityType getType() {
- return EntityType.ITEM_DISPLAY;
- }
-
@Override
public ItemStack getItemStack() {
return CraftItemStack.asBukkitCopy(getHandle().getItemStack());
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 d89b0336d0..26cc6ca6ab 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
@@ -10,7 +10,6 @@ import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.block.CraftBlock;
import org.bukkit.craftbukkit.inventory.CraftItemStack;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.ItemFrame;
public class CraftItemFrame extends CraftHanging implements ItemFrame {
@@ -166,9 +165,4 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame {
public String toString() {
return "CraftItemFrame{item=" + getItem() + ", rotation=" + getRotation() + "}";
}
-
- @Override
- public EntityType getType() {
- return EntityType.ITEM_FRAME;
- }
}
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 75b092527f..ffd05382be 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.projectile.EntityLargeFireball;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.LargeFireball;
public class CraftLargeFireball extends CraftSizedFireball implements LargeFireball {
@@ -25,9 +24,4 @@ public class CraftLargeFireball extends CraftSizedFireball implements LargeFireb
public String toString() {
return "CraftLargeFireball";
}
-
- @Override
- public EntityType getType() {
- return EntityType.FIREBALL;
- }
}
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 8f59c4a098..b0203c6a30 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
@@ -4,7 +4,6 @@ import com.google.common.base.Preconditions;
import net.minecraft.world.entity.decoration.EntityLeash;
import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.LeashHitch;
public class CraftLeash extends CraftHanging implements LeashHitch {
@@ -34,9 +33,4 @@ public class CraftLeash extends CraftHanging implements LeashHitch {
public String toString() {
return "CraftLeash";
}
-
- @Override
- public EntityType getType() {
- return EntityType.LEASH_HITCH;
- }
}
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 9ab9f0a312..381f448b01 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.EntityLightning;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.LightningStrike;
public class CraftLightningStrike extends CraftEntity implements LightningStrike {
@@ -24,9 +23,4 @@ public class CraftLightningStrike extends CraftEntity implements LightningStrike
public String toString() {
return "CraftLightningStrike";
}
-
- @Override
- public EntityType getType() {
- return EntityType.LIGHTNING;
- }
}
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 7d24c149e3..8d35243c0e 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
@@ -64,7 +64,6 @@ import org.bukkit.entity.Egg;
import org.bukkit.entity.EnderPearl;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityCategory;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Fireball;
import org.bukkit.entity.Firework;
import org.bukkit.entity.FishHook;
@@ -507,11 +506,6 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
return (T) launch.getBukkitEntity();
}
- @Override
- public EntityType getType() {
- return EntityType.UNKNOWN;
- }
-
@Override
public boolean hasLineOfSight(Entity other) {
Preconditions.checkState(!getHandle().generation, "Cannot check line of sight during world generation");
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 4b5fe3808b..8ded196b25 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
@@ -4,7 +4,6 @@ import com.google.common.base.Preconditions;
import net.minecraft.world.entity.animal.horse.EntityLlama;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.inventory.CraftInventoryLlama;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Horse;
import org.bukkit.entity.Llama;
import org.bukkit.entity.Llama.Color;
@@ -60,9 +59,4 @@ public class CraftLlama extends CraftChestedHorse implements Llama {
public String toString() {
return "CraftLlama";
}
-
- @Override
- public EntityType getType() {
- return EntityType.LLAMA;
- }
}
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 70071d9907..e128c9310c 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.projectile.EntityLlamaSpit;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.LlamaSpit;
import org.bukkit.projectiles.ProjectileSource;
@@ -22,11 +21,6 @@ public class CraftLlamaSpit extends AbstractProjectile implements LlamaSpit {
return "CraftLlamaSpit";
}
- @Override
- public EntityType getType() {
- return EntityType.LLAMA_SPIT;
- }
-
@Override
public ProjectileSource getShooter() {
return (getHandle().getOwner() != null) ? (ProjectileSource) getHandle().getOwner().getBukkitEntity() : null;
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 53909f6eee..ac38b7b903 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntityMagmaCube;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.MagmaCube;
public class CraftMagmaCube extends CraftSlime implements MagmaCube {
@@ -20,9 +19,4 @@ public class CraftMagmaCube extends CraftSlime implements MagmaCube {
public String toString() {
return "CraftMagmaCube";
}
-
- @Override
- public EntityType getType() {
- return EntityType.MAGMA_CUBE;
- }
}
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 1e794ec9fc..e6782a48d2 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
@@ -1,7 +1,6 @@
package org.bukkit.craftbukkit.entity;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Marker;
public class CraftMarker extends CraftEntity implements Marker {
@@ -15,11 +14,6 @@ public class CraftMarker extends CraftEntity implements Marker {
return (net.minecraft.world.entity.Marker) super.getHandle();
}
- @Override
- public EntityType getType() {
- return EntityType.MARKER;
- }
-
@Override
public String toString() {
return "CraftMarker";
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 cbd121c21a..2d2c80cf96 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
@@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.vehicle.EntityMinecartChest;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.inventory.CraftInventory;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.minecart.StorageMinecart;
import org.bukkit.inventory.Inventory;
@@ -25,9 +24,4 @@ public class CraftMinecartChest extends CraftMinecartContainer implements Storag
public String toString() {
return "CraftMinecartChest{" + "inventory=" + inventory + '}';
}
-
- @Override
- public EntityType getType() {
- return EntityType.MINECART_CHEST;
- }
}
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 32d1768d06..cfff1b1026 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
@@ -6,7 +6,6 @@ import org.bukkit.Bukkit;
import org.bukkit.Server;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.util.CraftChatMessage;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.minecart.CommandMinecart;
import org.bukkit.permissions.PermissibleBase;
import org.bukkit.permissions.Permission;
@@ -47,11 +46,6 @@ public class CraftMinecartCommand extends CraftMinecart implements CommandMineca
return "CraftMinecartCommand";
}
- @Override
- public EntityType getType() {
- return EntityType.MINECART_COMMAND;
- }
-
@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 1142cfce43..a810eb05e5 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
@@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import com.google.common.base.Preconditions;
import net.minecraft.world.entity.vehicle.EntityMinecartFurnace;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.minecart.PoweredMinecart;
@SuppressWarnings("deprecation")
@@ -32,9 +31,4 @@ public class CraftMinecartFurnace extends CraftMinecart implements PoweredMineca
public String toString() {
return "CraftMinecartFurnace";
}
-
- @Override
- public EntityType getType() {
- return EntityType.MINECART_FURNACE;
- }
}
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 17a42aec76..3bceeac62e 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
@@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.vehicle.EntityMinecartHopper;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.inventory.CraftInventory;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.minecart.HopperMinecart;
import org.bukkit.inventory.Inventory;
@@ -20,11 +19,6 @@ public final class CraftMinecartHopper extends CraftMinecartContainer implements
return "CraftMinecartHopper{" + "inventory=" + inventory + '}';
}
- @Override
- public EntityType getType() {
- return EntityType.MINECART_HOPPER;
- }
-
@Override
public Inventory getInventory() {
return inventory;
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 2830f543e4..1f8468054f 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.vehicle.EntityMinecartMobSpawner;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.minecart.SpawnerMinecart;
final class CraftMinecartMobSpawner extends CraftMinecart implements SpawnerMinecart {
@@ -14,9 +13,4 @@ final class CraftMinecartMobSpawner extends CraftMinecart implements SpawnerMine
public String toString() {
return "CraftMinecartMobSpawner";
}
-
- @Override
- public EntityType getType() {
- return EntityType.MINECART_MOB_SPAWNER;
- }
}
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 4c05a099a6..b618113475 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.vehicle.EntityMinecartAbstract;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.minecart.RideableMinecart;
public class CraftMinecartRideable extends CraftMinecart implements RideableMinecart {
@@ -14,9 +13,4 @@ public class CraftMinecartRideable extends CraftMinecart implements RideableMine
public String toString() {
return "CraftMinecartRideable";
}
-
- @Override
- public EntityType getType() {
- return EntityType.MINECART;
- }
}
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 8538601d0f..db91c9b48c 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
@@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import com.google.common.base.Preconditions;
import net.minecraft.world.entity.vehicle.EntityMinecartTNT;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.minecart.ExplosiveMinecart;
public final class CraftMinecartTNT extends CraftMinecart implements ExplosiveMinecart {
@@ -52,9 +51,4 @@ public final class CraftMinecartTNT extends CraftMinecart implements ExplosiveMi
public String toString() {
return "CraftMinecartTNT";
}
-
- @Override
- public EntityType getType() {
- return EntityType.MINECART_TNT;
- }
}
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 423b1deeab..18cfc80f6b 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.animal.horse.EntityHorseMule;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Horse.Variant;
import org.bukkit.entity.Mule;
@@ -17,11 +16,6 @@ public class CraftMule extends CraftChestedHorse implements Mule {
return "CraftMule";
}
- @Override
- public EntityType getType() {
- return EntityType.MULE;
- }
-
@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 24e2197ac6..37bb10ff8c 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
@@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import com.google.common.base.Preconditions;
import net.minecraft.world.entity.animal.EntityMushroomCow;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.MushroomCow;
import org.bukkit.entity.MushroomCow.Variant;
@@ -33,9 +32,4 @@ public class CraftMushroomCow extends CraftCow implements MushroomCow {
public String toString() {
return "CraftMushroomCow";
}
-
- @Override
- public EntityType getType() {
- return EntityType.MUSHROOM_COW;
- }
}
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 ec804e04d5..38807f0edf 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.animal.EntityOcelot;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Ocelot;
import org.bukkit.entity.Ocelot.Type;
@@ -40,9 +39,4 @@ public class CraftOcelot extends CraftAnimals implements Ocelot {
public String toString() {
return "CraftOcelot";
}
-
- @Override
- public EntityType getType() {
- return EntityType.OCELOT;
- }
}
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 55db4c57fc..7a7a6b4c36 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
@@ -7,7 +7,6 @@ import org.bukkit.Art;
import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.CraftArt;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Painting;
public class CraftPainting extends CraftHanging implements Painting {
@@ -62,9 +61,4 @@ public class CraftPainting extends CraftHanging implements Painting {
public String toString() {
return "CraftPainting{art=" + getArt() + "}";
}
-
- @Override
- public EntityType getType() {
- return EntityType.PAINTING;
- }
}
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 06772804f6..514af4e3d9 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
@@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import com.google.common.base.Preconditions;
import net.minecraft.world.entity.animal.EntityPanda;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Panda;
import org.bukkit.entity.Panda.Gene;
@@ -18,11 +17,6 @@ public class CraftPanda extends CraftAnimals implements Panda {
return (EntityPanda) super.getHandle();
}
- @Override
- public EntityType getType() {
- return EntityType.PANDA;
- }
-
@Override
public String toString() {
return "CraftPanda";
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 e9726b0514..16c2afba95 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 net.minecraft.world.entity.animal.EntityParrot;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Parrot;
import org.bukkit.entity.Parrot.Variant;
@@ -35,11 +34,6 @@ public class CraftParrot extends CraftTameableAnimal implements Parrot {
return "CraftParrot";
}
- @Override
- public EntityType getType() {
- return EntityType.PARROT;
- }
-
@Override
public boolean isDancing() {
return 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 be2047c9d7..877429f154 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntityPhantom;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Phantom;
public class CraftPhantom extends CraftFlying implements Phantom, CraftEnemy {
@@ -30,9 +29,4 @@ public class CraftPhantom extends CraftFlying implements Phantom, CraftEnemy {
public String toString() {
return "CraftPhantom";
}
-
- @Override
- public EntityType getType() {
- return EntityType.PHANTOM;
- }
}
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 762571ab28..e18445804b 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
@@ -4,7 +4,6 @@ import com.google.common.base.Preconditions;
import net.minecraft.world.entity.animal.EntityPig;
import org.bukkit.Material;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Pig;
public class CraftPig extends CraftAnimals implements Pig {
@@ -66,9 +65,4 @@ public class CraftPig extends CraftAnimals implements Pig {
public String toString() {
return "CraftPig";
}
-
- @Override
- public EntityType getType() {
- return EntityType.PIG;
- }
}
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 96ae60834d..fcd97b822c 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntityPigZombie;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.PigZombie;
public class CraftPigZombie extends CraftZombie implements PigZombie {
@@ -41,11 +40,6 @@ public class CraftPigZombie extends CraftZombie implements PigZombie {
return "CraftPigZombie";
}
- @Override
- public EntityType getType() {
- return EntityType.ZOMBIFIED_PIGLIN;
- }
-
@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 814da5c4ec..382fbf592f 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
@@ -10,7 +10,6 @@ import org.bukkit.Material;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.inventory.CraftInventory;
import org.bukkit.craftbukkit.util.CraftMagicNumbers;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Piglin;
import org.bukkit.inventory.Inventory;
@@ -82,11 +81,6 @@ public class CraftPiglin extends CraftPiglinAbstract implements Piglin {
return (EntityPiglin) super.getHandle();
}
- @Override
- public EntityType getType() {
- return EntityType.PIGLIN;
- }
-
@Override
public String toString() {
return "CraftPiglin";
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 2d689e055c..db41b1006b 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.piglin.EntityPiglinBrute;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.PiglinBrute;
public class CraftPiglinBrute extends CraftPiglinAbstract implements PiglinBrute {
@@ -16,11 +15,6 @@ public class CraftPiglinBrute extends CraftPiglinAbstract implements PiglinBrute
return (EntityPiglinBrute) super.getHandle();
}
- @Override
- public EntityType getType() {
- return EntityType.PIGLIN_BRUTE;
- }
-
@Override
public String toString() {
return "CraftPiglinBrute";
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 72ac9eae71..be108be93b 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
@@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntityPillager;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.inventory.CraftInventory;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Pillager;
import org.bukkit.inventory.Inventory;
@@ -18,11 +17,6 @@ public class CraftPillager extends CraftIllager implements Pillager {
return (EntityPillager) super.getHandle();
}
- @Override
- public EntityType getType() {
- return EntityType.PILLAGER;
- }
-
@Override
public String toString() {
return "CraftPillager";
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 8bb4889e0f..6bb6a83c1e 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
@@ -1743,11 +1743,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
}
- @Override
- public EntityType getType() {
- return EntityType.PLAYER;
- }
-
@Override
public void setMetadata(String metadataKey, MetadataValue newMetadataValue) {
server.getPlayerMetadata().setMetadata(this, metadataKey, newMetadataValue);
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 d95734fe85..89478ab067 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.animal.EntityPolarBear;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.PolarBear;
public class CraftPolarBear extends CraftAnimals implements PolarBear {
@@ -19,9 +18,4 @@ public class CraftPolarBear extends CraftAnimals implements PolarBear {
public String toString() {
return "CraftPolarBear";
}
-
- @Override
- public EntityType getType() {
- return EntityType.POLAR_BEAR;
- }
}
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 d65c08a020..6468400bc3 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.animal.EntityPufferFish;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.PufferFish;
public class CraftPufferFish extends CraftFish implements PufferFish {
@@ -30,9 +29,4 @@ public class CraftPufferFish extends CraftFish implements PufferFish {
public String toString() {
return "CraftPufferFish";
}
-
- @Override
- public EntityType getType() {
- return EntityType.PUFFERFISH;
- }
}
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 d2acd0db91..5649cdad5e 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
@@ -5,7 +5,6 @@ import net.minecraft.world.entity.animal.EntityRabbit;
import net.minecraft.world.level.World;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftWorld;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Rabbit;
import org.bukkit.entity.Rabbit.Type;
@@ -25,11 +24,6 @@ public class CraftRabbit extends CraftAnimals implements Rabbit {
return "CraftRabbit{RabbitType=" + getRabbitType() + "}";
}
- @Override
- public EntityType getType() {
- return EntityType.RABBIT;
- }
-
@Override
public Type getRabbitType() {
return Type.values()[getHandle().getVariant().ordinal()];
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 23697cf50c..f17f0884de 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntityRavager;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Ravager;
public class CraftRavager extends CraftRaider implements Ravager {
@@ -16,11 +15,6 @@ public class CraftRavager extends CraftRaider implements Ravager {
return (EntityRavager) super.getHandle();
}
- @Override
- public EntityType getType() {
- return EntityType.RAVAGER;
- }
-
@Override
public String toString() {
return "CraftRavager";
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 f635bec316..041ed192d5 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.animal.EntitySalmon;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Salmon;
public class CraftSalmon extends CraftFish implements Salmon {
@@ -20,9 +19,4 @@ public class CraftSalmon extends CraftFish implements Salmon {
public String toString() {
return "CraftSalmon";
}
-
- @Override
- public EntityType getType() {
- return EntityType.SALMON;
- }
}
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 886f57fe55..a498b9c69d 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
@@ -4,7 +4,6 @@ import net.minecraft.world.entity.animal.EntitySheep;
import net.minecraft.world.item.EnumColor;
import org.bukkit.DyeColor;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Sheep;
public class CraftSheep extends CraftAnimals implements Sheep {
@@ -41,9 +40,4 @@ public class CraftSheep extends CraftAnimals implements Sheep {
public String toString() {
return "CraftSheep";
}
-
- @Override
- public EntityType getType() {
- return EntityType.SHEEP;
- }
}
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 e05bef5be3..7c89d088c2 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
@@ -6,7 +6,6 @@ import org.bukkit.DyeColor;
import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.block.CraftBlock;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Shulker;
public class CraftShulker extends CraftGolem implements Shulker, CraftEnemy {
@@ -20,11 +19,6 @@ public class CraftShulker extends CraftGolem implements Shulker, CraftEnemy {
return "CraftShulker";
}
- @Override
- public EntityType getType() {
- return EntityType.SHULKER;
- }
-
@Override
public EntityShulker getHandle() {
return (EntityShulker) 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 8d409f48a3..ab21af41d5 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
@@ -4,7 +4,6 @@ import com.google.common.base.Preconditions;
import net.minecraft.world.entity.projectile.EntityShulkerBullet;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.ShulkerBullet;
import org.bukkit.projectiles.ProjectileSource;
@@ -46,11 +45,6 @@ public class CraftShulkerBullet extends AbstractProjectile implements ShulkerBul
return "CraftShulkerBullet";
}
- @Override
- public EntityType getType() {
- return EntityType.SHULKER_BULLET;
- }
-
@Override
public EntityShulkerBullet getHandle() {
return (EntityShulkerBullet) 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 1160c32b84..aaed9aa22d 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntitySilverfish;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Silverfish;
public class CraftSilverfish extends CraftMonster implements Silverfish {
@@ -19,9 +18,4 @@ public class CraftSilverfish extends CraftMonster implements Silverfish {
public String toString() {
return "CraftSilverfish";
}
-
- @Override
- public EntityType getType() {
- return EntityType.SILVERFISH;
- }
}
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 b3f1fe6542..09de7114d1 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
@@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import com.google.common.base.Preconditions;
import net.minecraft.world.entity.monster.EntitySkeleton;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Skeleton;
public class CraftSkeleton extends CraftAbstractSkeleton implements Skeleton {
@@ -43,11 +42,6 @@ public class CraftSkeleton extends CraftAbstractSkeleton implements Skeleton {
return "CraftSkeleton";
}
- @Override
- public EntityType getType() {
- return EntityType.SKELETON;
- }
-
@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 410682c4c8..b24e24b438 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.animal.horse.EntityHorseSkeleton;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Horse.Variant;
import org.bukkit.entity.SkeletonHorse;
@@ -17,11 +16,6 @@ public class CraftSkeletonHorse extends CraftAbstractHorse implements SkeletonHo
return "CraftSkeletonHorse";
}
- @Override
- public EntityType getType() {
- return EntityType.SKELETON_HORSE;
- }
-
@Override
public Variant getVariant() {
return Variant.SKELETON_HORSE;
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 cc09534dd0..75097983b7 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntitySlime;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Slime;
public class CraftSlime extends CraftMob implements Slime, CraftEnemy {
@@ -30,9 +29,4 @@ public class CraftSlime extends CraftMob implements Slime, CraftEnemy {
public String toString() {
return "CraftSlime";
}
-
- @Override
- public EntityType getType() {
- return EntityType.SLIME;
- }
}
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 53749f3ad3..24083c8b0e 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.projectile.EntitySmallFireball;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.SmallFireball;
public class CraftSmallFireball extends CraftSizedFireball implements SmallFireball {
@@ -19,9 +18,4 @@ public class CraftSmallFireball extends CraftSizedFireball implements SmallFireb
public String toString() {
return "CraftSmallFireball";
}
-
- @Override
- public EntityType getType() {
- return EntityType.SMALL_FIREBALL;
- }
}
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 9848733296..795f30fee3 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
@@ -8,7 +8,6 @@ import net.minecraft.world.entity.ai.memory.MemoryModuleType;
import org.bukkit.Location;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.util.CraftLocation;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Sniffer;
public class CraftSniffer extends CraftAnimals implements Sniffer {
@@ -27,11 +26,6 @@ public class CraftSniffer extends CraftAnimals implements Sniffer {
return "CraftSniffer";
}
- @Override
- public EntityType getType() {
- return EntityType.SNIFFER;
- }
-
@Override
public Collection<Location> getExploredLocations() {
return this.getHandle().getExploredPositions().map(blockPosition -> CraftLocation.toBukkit(blockPosition.pos(), this.server.getServer().getLevel(blockPosition.dimension()))).collect(Collectors.toList());
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 21976458cd..32447e2e96 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.projectile.EntitySnowball;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Snowball;
public class CraftSnowball extends CraftThrowableProjectile implements Snowball {
@@ -19,9 +18,4 @@ public class CraftSnowball extends CraftThrowableProjectile implements Snowball
public String toString() {
return "CraftSnowball";
}
-
- @Override
- public EntityType getType() {
- return EntityType.SNOWBALL;
- }
}
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 d13fef732b..b00b0a72e1 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.animal.EntitySnowman;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Snowman;
public class CraftSnowman extends CraftGolem implements Snowman {
@@ -29,9 +28,4 @@ public class CraftSnowman extends CraftGolem implements Snowman {
public String toString() {
return "CraftSnowman";
}
-
- @Override
- public EntityType getType() {
- return EntityType.SNOWMAN;
- }
}
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 e9379d6233..bcf7d7325b 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.projectile.EntitySpectralArrow;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.SpectralArrow;
public class CraftSpectralArrow extends CraftArrow implements SpectralArrow {
@@ -21,11 +20,6 @@ public class CraftSpectralArrow extends CraftArrow implements SpectralArrow {
return "CraftSpectralArrow";
}
- @Override
- public EntityType getType() {
- return EntityType.SPECTRAL_ARROW;
- }
-
@Override
public int getGlowingTicks() {
return getHandle().duration;
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 1cfef80f2f..6e1876e96e 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntitySpider;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Spider;
public class CraftSpider extends CraftMonster implements Spider {
@@ -20,9 +19,4 @@ public class CraftSpider extends CraftMonster implements Spider {
public String toString() {
return "CraftSpider";
}
-
- @Override
- public EntityType getType() {
- return EntityType.SPIDER;
- }
}
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 6557b3b4f5..82e0109a30 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.animal.EntitySquid;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Squid;
public class CraftSquid extends CraftWaterMob implements Squid {
@@ -20,9 +19,4 @@ public class CraftSquid extends CraftWaterMob implements Squid {
public String toString() {
return "CraftSquid";
}
-
- @Override
- public EntityType getType() {
- return EntityType.SQUID;
- }
}
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 81193374df..335f3f103b 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntitySkeletonStray;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Skeleton.SkeletonType;
import org.bukkit.entity.Stray;
@@ -17,11 +16,6 @@ public class CraftStray extends CraftAbstractSkeleton implements Stray {
return "CraftStray";
}
- @Override
- public EntityType getType() {
- return EntityType.STRAY;
- }
-
@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 1537ae3bbc..d57b6a975d 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
@@ -4,7 +4,6 @@ import com.google.common.base.Preconditions;
import net.minecraft.world.entity.monster.EntityStrider;
import org.bukkit.Material;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Strider;
public class CraftStrider extends CraftAnimals implements Strider {
@@ -76,9 +75,4 @@ public class CraftStrider extends CraftAnimals implements Strider {
public String toString() {
return "CraftStrider";
}
-
- @Override
- public EntityType getType() {
- return EntityType.STRIDER;
- }
}
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 79bc9adf7e..7ad063e0ef 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
@@ -4,7 +4,6 @@ import net.minecraft.world.entity.EntityLiving;
import net.minecraft.world.entity.item.EntityTNTPrimed;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.TNTPrimed;
@@ -54,11 +53,6 @@ public class CraftTNTPrimed extends CraftEntity implements TNTPrimed {
return "CraftTNTPrimed";
}
- @Override
- public EntityType getType() {
- return EntityType.PRIMED_TNT;
- }
-
@Override
public Entity getSource() {
EntityLiving source = 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 28fbb0df4e..c4f117704d 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.animal.frog.Tadpole;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
public class CraftTadpole extends CraftFish implements org.bukkit.entity.Tadpole {
@@ -20,11 +19,6 @@ public class CraftTadpole extends CraftFish implements org.bukkit.entity.Tadpole
return "CraftTadpole";
}
- @Override
- public EntityType getType() {
- return EntityType.TADPOLE;
- }
-
@Override
public int getAge() {
return getHandle().age;
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 0b1bb724d7..a1d8c2c59e 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
@@ -5,7 +5,6 @@ import net.minecraft.world.entity.Display;
import org.bukkit.Color;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.util.CraftChatMessage;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.TextDisplay;
public class CraftTextDisplay extends CraftDisplay implements TextDisplay {
@@ -24,11 +23,6 @@ public class CraftTextDisplay extends CraftDisplay implements TextDisplay {
return "CraftTextDisplay";
}
- @Override
- public EntityType getType() {
- return EntityType.TEXT_DISPLAY;
- }
-
@Override
public String getText() {
return CraftChatMessage.fromComponent(getHandle().getText());
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 42d7b91057..884ca109a1 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.projectile.EntityThrownExpBottle;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.ThrownExpBottle;
public class CraftThrownExpBottle extends CraftThrowableProjectile implements ThrownExpBottle {
@@ -19,9 +18,4 @@ public class CraftThrownExpBottle extends CraftThrowableProjectile implements Th
public String toString() {
return "EntityThrownExpBottle";
}
-
- @Override
- public EntityType getType() {
- return EntityType.THROWN_EXP_BOTTLE;
- }
}
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 f94b53a9cd..bae19b17e6 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
@@ -10,7 +10,6 @@ import org.bukkit.Material;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.inventory.CraftItemStack;
import org.bukkit.craftbukkit.potion.CraftPotionUtil;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.ThrownPotion;
import org.bukkit.inventory.ItemStack;
import org.bukkit.potion.PotionEffect;
@@ -46,9 +45,4 @@ public class CraftThrownPotion extends CraftThrowableProjectile implements Throw
public EntityPotion getHandle() {
return (EntityPotion) entity;
}
-
- @Override
- public EntityType getType() {
- return EntityType.SPLASH_POTION;
- }
}
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTippedArrow.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTippedArrow.java
index 7fba4d5d3c..99d82b2a26 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTippedArrow.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTippedArrow.java
@@ -12,7 +12,6 @@ import org.bukkit.Color;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.potion.CraftPotionUtil;
import org.bukkit.entity.Arrow;
-import org.bukkit.entity.EntityType;
import org.bukkit.potion.PotionData;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
@@ -33,11 +32,6 @@ public class CraftTippedArrow extends CraftArrow implements Arrow {
return "CraftTippedArrow";
}
- @Override
- public EntityType getType() {
- return EntityType.ARROW;
- }
-
@Override
public boolean addCustomEffect(PotionEffect effect, boolean override) {
int effectId = effect.getType().getId();
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 1419d88ecf..129d63184d 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.animal.horse.EntityLlamaTrader;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.TraderLlama;
public class CraftTraderLlama extends CraftLlama implements TraderLlama {
@@ -20,9 +19,4 @@ public class CraftTraderLlama extends CraftLlama implements TraderLlama {
public String toString() {
return "CraftTraderLlama";
}
-
- @Override
- public EntityType getType() {
- return EntityType.TRADER_LLAMA;
- }
}
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 af7dbaa68e..6213635224 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
@@ -3,7 +3,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.projectile.EntityThrownTrident;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.inventory.CraftItemStack;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Trident;
import org.bukkit.inventory.ItemStack;
@@ -32,9 +31,4 @@ public class CraftTrident extends CraftArrow implements Trident {
public String toString() {
return "CraftTrident";
}
-
- @Override
- public EntityType getType() {
- return EntityType.TRIDENT;
- }
}
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 f4e1a4f298..60b16c5ae1 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
@@ -5,7 +5,6 @@ import java.util.Map;
import net.minecraft.world.entity.animal.EntityTropicalFish;
import org.bukkit.DyeColor;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.TropicalFish;
import org.bukkit.entity.TropicalFish.Pattern;
@@ -25,11 +24,6 @@ public class CraftTropicalFish extends CraftFish implements TropicalFish {
return "CraftTropicalFish";
}
- @Override
- public EntityType getType() {
- return EntityType.TROPICAL_FISH;
- }
-
@Override
public DyeColor getPatternColor() {
return getPatternColor(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 301cfd1c63..789e83dbc1 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.animal.EntityTurtle;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Turtle;
public class CraftTurtle extends CraftAnimals implements Turtle {
@@ -21,11 +20,6 @@ public class CraftTurtle extends CraftAnimals implements Turtle {
return "CraftTurtle";
}
- @Override
- public EntityType getType() {
- return EntityType.TURTLE;
- }
-
@Override
public boolean hasEgg() {
return getHandle().hasEgg();
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 0bb05de43e..13e4da8232 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
@@ -6,7 +6,6 @@ import net.minecraft.world.entity.monster.EntityVex;
import org.bukkit.Location;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.util.CraftLocation;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Vex;
public class CraftVex extends CraftMonster implements Vex {
@@ -25,11 +24,6 @@ public class CraftVex extends CraftMonster implements Vex {
return "CraftVex";
}
- @Override
- public EntityType getType() {
- return EntityType.VEX;
- }
-
@Override
public boolean isCharging() {
return 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 d3d40af607..d31bd0156c 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
@@ -14,7 +14,6 @@ import org.bukkit.Location;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.util.CraftLocation;
import org.bukkit.craftbukkit.util.CraftNamespacedKey;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Villager;
import org.bukkit.entity.ZombieVillager;
import org.bukkit.event.entity.CreatureSpawnEvent;
@@ -35,11 +34,6 @@ public class CraftVillager extends CraftAbstractVillager implements Villager {
return "CraftVillager";
}
- @Override
- public EntityType getType() {
- return EntityType.VILLAGER;
- }
-
@Override
public void remove() {
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 764a5e219a..be847f1b22 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
@@ -10,7 +10,6 @@ import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.util.CraftNamespacedKey;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Villager;
import org.bukkit.entity.ZombieVillager;
@@ -30,11 +29,6 @@ public class CraftVillagerZombie extends CraftZombie implements ZombieVillager {
return "CraftVillagerZombie";
}
- @Override
- public EntityType getType() {
- return EntityType.ZOMBIE_VILLAGER;
- }
-
@Override
public Villager.Profession getVillagerProfession() {
return Villager.Profession.valueOf(BuiltInRegistries.VILLAGER_PROFESSION.getKey(getHandle().getVillagerData().getProfession()).getPath().toUpperCase(Locale.ROOT));
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 5bb6909a4d..c5f739c12a 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntityVindicator;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Vindicator;
public class CraftVindicator extends CraftIllager implements Vindicator {
@@ -21,11 +20,6 @@ public class CraftVindicator extends CraftIllager implements Vindicator {
return "CraftVindicator";
}
- @Override
- public EntityType getType() {
- return EntityType.VINDICATOR;
- }
-
@Override
public boolean isJohnny() {
return getHandle().isJohnny;
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 c8344ce0a8..71bae8b314 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.npc.EntityVillagerTrader;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.WanderingTrader;
public class CraftWanderingTrader extends CraftAbstractVillager implements WanderingTrader {
@@ -21,11 +20,6 @@ public class CraftWanderingTrader extends CraftAbstractVillager implements Wande
return "CraftWanderingTrader";
}
- @Override
- public EntityType getType() {
- return EntityType.WANDERING_TRADER;
- }
-
@Override
public int getDespawnDelay() {
return 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 e25047bf1b..7b3239f4ac 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
@@ -7,7 +7,6 @@ import net.minecraft.world.entity.monster.warden.WardenAi;
import org.bukkit.Location;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity;
public class CraftWarden extends CraftMonster implements org.bukkit.entity.Warden {
@@ -26,11 +25,6 @@ public class CraftWarden extends CraftMonster implements org.bukkit.entity.Warde
return "CraftWarden";
}
- @Override
- public EntityType getType() {
- return EntityType.WARDEN;
- }
-
@Override
public int getAnger() {
return getHandle().getAngerManagement().getActiveAnger(getHandle().getTarget());
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 0dd4ab8a19..e5cb9e2077 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntityWitch;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Witch;
public class CraftWitch extends CraftRaider implements Witch {
@@ -20,11 +19,6 @@ public class CraftWitch extends CraftRaider implements Witch {
return "CraftWitch";
}
- @Override
- public EntityType getType() {
- return EntityType.WITCH;
- }
-
@Override
public boolean isDrinkingPotion() {
return 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 bafe5fed0b..38db21cd3e 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
@@ -6,7 +6,6 @@ import net.minecraft.world.entity.boss.wither.EntityWither;
import org.bukkit.boss.BossBar;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.boss.CraftBossBar;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Wither;
@@ -32,11 +31,6 @@ public class CraftWither extends CraftMonster implements Wither {
return "CraftWither";
}
- @Override
- public EntityType getType() {
- return EntityType.WITHER;
- }
-
@Override
public BossBar getBossBar() {
return 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 65055a057f..6f96b750e7 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntitySkeletonWither;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Skeleton.SkeletonType;
import org.bukkit.entity.WitherSkeleton;
@@ -17,11 +16,6 @@ public class CraftWitherSkeleton extends CraftAbstractSkeleton implements Wither
return "CraftWitherSkeleton";
}
- @Override
- public EntityType getType() {
- return EntityType.WITHER_SKELETON;
- }
-
@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 c220a77064..5c09ceb7cf 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.projectile.EntityWitherSkull;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.WitherSkull;
public class CraftWitherSkull extends CraftFireball implements WitherSkull {
@@ -29,9 +28,4 @@ public class CraftWitherSkull extends CraftFireball implements WitherSkull {
public String toString() {
return "CraftWitherSkull";
}
-
- @Override
- public EntityType getType() {
- return EntityType.WITHER_SKULL;
- }
}
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 49213ff3ce..3e591feffc 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
@@ -4,7 +4,6 @@ import net.minecraft.world.entity.animal.EntityWolf;
import net.minecraft.world.item.EnumColor;
import org.bukkit.DyeColor;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Wolf;
public class CraftWolf extends CraftTameableAnimal implements Wolf {
@@ -31,11 +30,6 @@ public class CraftWolf extends CraftTameableAnimal implements Wolf {
return (EntityWolf) entity;
}
- @Override
- public EntityType getType() {
- return EntityType.WOLF;
- }
-
@Override
public DyeColor getCollarColor() {
return DyeColor.getByWoolData((byte) 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 1f776372ed..6b4907a369 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.monster.EntityZoglin;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Zoglin;
public class CraftZoglin extends CraftMonster implements Zoglin {
@@ -31,11 +30,6 @@ public class CraftZoglin extends CraftMonster implements Zoglin {
return "CraftZoglin";
}
- @Override
- public EntityType getType() {
- return EntityType.ZOGLIN;
- }
-
@Override
public int getAge() {
return 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 72dadd8eea..100d3aa17c 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
@@ -4,7 +4,6 @@ import com.google.common.base.Preconditions;
import net.minecraft.world.entity.monster.EntityZombie;
import net.minecraft.world.entity.monster.EntityZombieVillager;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Villager;
import org.bukkit.entity.Zombie;
@@ -24,11 +23,6 @@ public class CraftZombie extends CraftMonster implements Zombie {
return "CraftZombie";
}
- @Override
- public EntityType getType() {
- return EntityType.ZOMBIE;
- }
-
@Override
public boolean isBaby() {
return 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 063933dbcb..4a69d07c2f 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
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.animal.horse.EntityHorseZombie;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.EntityType;
import org.bukkit.entity.Horse.Variant;
import org.bukkit.entity.ZombieHorse;
@@ -17,11 +16,6 @@ public class CraftZombieHorse extends CraftAbstractHorse implements ZombieHorse
return "CraftZombieHorse";
}
- @Override
- public EntityType getType() {
- return EntityType.ZOMBIE_HORSE;
- }
-
@Override
public Variant getVariant() {
return Variant.UNDEAD_HORSE;